From 6988752d05fad29a6d158a5c2d20eb09875ce075 Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Tue, 28 Jan 2020 15:24:23 +0100 Subject: [PATCH] Re-apply fix for Win32 --- src/libslic3r/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index c145eded0..73b7df5bc 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt @@ -233,11 +233,6 @@ cmake_policy(SET CMP0011 NEW) find_package(CGAL REQUIRED) cmake_policy(POP) -set(_cgal_defines "") -if (MSVC AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # 32 bit MSVC workaround - set(_cgal_defines CGAL_DO_NOT_USE_MPZF) -endif () - add_library(libslic3r_cgal STATIC MeshBoolean.cpp MeshBoolean.hpp) target_include_directories(libslic3r_cgal PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) @@ -259,6 +254,10 @@ endif() target_link_libraries(libslic3r_cgal PRIVATE ${_cgal_tgt} libigl) +if (MSVC AND "${CMAKE_SIZEOF_VOID_P}" STREQUAL "4") # 32 bit MSVC workaround + target_compile_definitions(libslic3r_cgal PRIVATE CGAL_DO_NOT_USE_MPZF) +endif () + encoding_check(libslic3r) target_compile_definitions(libslic3r PUBLIC -DUSE_TBB -DTBB_USE_CAPTURED_EXCEPTION=0)