diff options
| author | bubnikv <bubnikv@gmail.com> | 2019-07-04 21:22:15 +0300 |
|---|---|---|
| committer | bubnikv <bubnikv@gmail.com> | 2019-07-04 21:22:15 +0300 |
| commit | c7cc76006706fefef52060a2165708c233dbadfd (patch) | |
| tree | afa1f11f7643f12c9a1a698be34b6ab33707604c /deps | |
| parent | 1070991149b5279f96fb4365094c6eec98d9243f (diff) | |
| parent | f617d747293de0e0bbb500ced8c4a66cdbdadf24 (diff) | |
Merge remote-tracking branch 'origin/master' into vb_undo_redo
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | deps/deps-unix-common.cmake | 2 | ||||
| -rw-r--r-- | deps/deps-windows.cmake | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 1c468607e..4845b1cba 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -36,10 +36,11 @@ set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination direct option(DEP_DEBUG "Build debug variants (only applicable on Windows)" ON) option(DEP_WX_STABLE "Build against wxWidgets stable 3.0 as opposed to default 3.1 (Linux only)" OFF) -# IGL static library in release mode produces 50MB binary. On the build server, it should be -# disabled and used in header-only mode. On developer machines, it can be enabled to speed -# up conpilation and suppress warnings coming from IGL. -option(DEP_BUILD_IGL_STATIC "Build IGL as a static library. Might cause link errors and increase binary size." OFF) +# On developer machines, it can be enabled to speed up compilation and suppress warnings coming from IGL. +# FIXME: +# Enabling this option is not safe. IGL will compile itself with its own version of Eigen while +# Slic3r compiles with a different version which will cause runtime errors. +# option(DEP_BUILD_IGL_STATIC "Build IGL as a static library. Might cause link errors and increase binary size." OFF) message(STATUS "PrusaSlicer deps DESTDIR: ${DESTDIR}") message(STATUS "PrusaSlicer deps debug build: ${DEP_DEBUG}") diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake index 6d9d6fd75..e323460a6 100644 --- a/deps/deps-unix-common.cmake +++ b/deps/deps-unix-common.cmake @@ -64,7 +64,7 @@ ExternalProject_Add(dep_libigl -DLIBIGL_BUILD_PYTHON=OFF -DLIBIGL_BUILD_TESTS=OFF -DLIBIGL_BUILD_TUTORIALS=OFF - -DLIBIGL_USE_STATIC_LIBRARY=${DEP_BUILD_IGL_STATIC} + -DLIBIGL_USE_STATIC_LIBRARY=OFF #${DEP_BUILD_IGL_STATIC} -DLIBIGL_WITHOUT_COPYLEFT=OFF -DLIBIGL_WITH_CGAL=OFF -DLIBIGL_WITH_COMISO=OFF diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index 2595f94d8..9092f330b 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -278,7 +278,7 @@ ExternalProject_Add(dep_libigl -DLIBIGL_BUILD_PYTHON=OFF -DLIBIGL_BUILD_TESTS=OFF -DLIBIGL_BUILD_TUTORIALS=OFF - -DLIBIGL_USE_STATIC_LIBRARY=${DEP_BUILD_IGL_STATIC} + -DLIBIGL_USE_STATIC_LIBRARY=OFF #${DEP_BUILD_IGL_STATIC} -DLIBIGL_WITHOUT_COPYLEFT=OFF -DLIBIGL_WITH_CGAL=OFF -DLIBIGL_WITH_COMISO=OFF |