Finding GLEW work in release and debug.

Make building in release and debug in one cmake run on msvc with the prusaslicer_add_cmake_project function.

deps/CMakeLists.txt

@@ -45,32 +45,39 @@ option(DEP_WX_STABLE "Build against wxWidgets stable 3.0 as opposed to default 3
 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)

deps/GLEW/GLEW.cmake

@@ -5,3 +5,7 @@ prusaslicer_add_cmake_project(
   GLEW
   SOURCE_DIR  ${CMAKE_CURRENT_LIST_DIR}/glew
 )
+
+if (MSVC)
+    add_debug_dep(dep_GLEW)
+endif ()

deps/GLEW/glew/CMakeLists.txt

@@ -7,6 +7,10 @@ add_library(glew src/glew.c)
 target_include_directories(glew PRIVATE include/)
 target_link_libraries(glew PUBLIC OpenGL::GL)
 
+if (NOT BUILD_SHARED_LIBS)
+    target_compile_definitions(glew PUBLIC GLEW_STATIC)
+endif ()
+
 include(GNUInstallDirs)
 
 install( 
@@ -21,40 +25,9 @@ install(
 add_library(GLEW INTERFACE)
 target_link_libraries(GLEW INTERFACE glew)
 
-include(CMakePackageConfigHelpers)
-
-write_basic_package_version_file(
-    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"     
-    VERSION 1.13.0
-    COMPATIBILITY AnyNewerVersion
-)
-
 install(TARGETS glew GLEW
-    EXPORT ${PROJECT_NAME}Targets
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} 
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
     INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
-
-export(EXPORT ${PROJECT_NAME}Targets 
-       FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" 
-       NAMESPACE ${PROJECT_NAME}:: )
-
-set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
-
-install(EXPORT ${PROJECT_NAME}Targets
-  FILE
-    "${PROJECT_NAME}Config.cmake"
-  NAMESPACE
-    ${PROJECT_NAME}::
-  DESTINATION
-    ${ConfigPackageLocation}
-)
-
-install(
-    FILES
-      "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-    DESTINATION
-      ${ConfigPackageLocation}
-)
+)

deps/OpenCSG/OpenCSG.cmake

@@ -4,4 +4,8 @@ prusaslicer_add_cmake_project(OpenCSG
     GIT_TAG 83e274457b46c9ad11a4ee599203250b1618f3b9 #v1.4.2
     PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt.in ./CMakeLists.txt
     DEPENDS dep_GLEW
-)
+)
+
+if (MSVC)
+    add_debug_dep(dep_OpenCSG)
+endif ()