Merge branch 'tm_opencsg'

deps/CMakeLists.txt

@@ -46,30 +46,38 @@ message(STATUS "PrusaSlicer deps DESTDIR: ${DESTDIR}")
 message(STATUS "PrusaSlicer deps debug build: ${DEP_DEBUG}")
 
 function(prusaslicer_add_cmake_project projectname)
-    cmake_parse_arguments(P_ARGS "" "INSTALL_DIR" "CMAKE_ARGS" ${ARGN})
+    cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN})
 
-    get_property(_is_multi GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
     set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
-
-    if (_is_multi)
+    if (_is_multi OR MSVC)
         set(_configs_line "")
     endif ()
 
+    set(_gen "")
+    set(_build_j "-j${NPROC}")
+    if (MSVC)
+        set(_gen CMAKE_GENERATOR "${DEP_MSVC_GEN}")
+        set(_build_j "/m")
+    endif ()
+
     ExternalProject_Add(
         dep_${projectname}
         EXCLUDE_FROM_ALL    ON
         INSTALL_DIR         ${DESTDIR}/usr/local
-        CMAKE_ARGS         
+        ${_gen}
+        CMAKE_ARGS
             -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
             -DCMAKE_PREFIX_PATH:STRING=${DESTDIR}/usr/local
             -DCMAKE_DEBUG_POSTFIX:STRING=d
             -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
             -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
             -DBUILD_SHARED_LIBS:BOOL=OFF
-            ${_configs_line}
+            "${_configs_line}"
             ${DEP_CMAKE_OPTS}
             ${P_ARGS_CMAKE_ARGS}
        ${P_ARGS_UNPARSED_ARGUMENTS}
+       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
+       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
     )
 
 endfunction(prusaslicer_add_cmake_project)
@@ -113,6 +121,9 @@ else()
     include("deps-linux.cmake")
 endif()
 
+include(GLEW/GLEW.cmake)
+include(OpenCSG/OpenCSG.cmake)
+
 include(GMP/GMP.cmake)
 include(MPFR/MPFR.cmake)
 include(CGAL/CGAL.cmake)
@@ -131,6 +142,7 @@ if (MSVC)
         # dep_qhull # Experimental
         dep_zlib    # on Windows we still need zlib
         dep_openvdb
+        dep_OpenCSG
         dep_cgal
     )
 
@@ -147,6 +159,7 @@ else()
         dep_nlopt
         dep_qhull
         dep_openvdb
+        dep_OpenCSG
         dep_cgal
         # dep_libigl # Not working, static build has different Eigen
     )