diff --git a/deps/Boost/Boost.cmake b/deps/Boost/Boost.cmake index d20f6f97ad..e8aebb1b92 100644 --- a/deps/Boost/Boost.cmake +++ b/deps/Boost/Boost.cmake @@ -10,7 +10,13 @@ if (APPLE AND CMAKE_OSX_ARCHITECTURES) set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}") endif () +set(_options "") +if (MSVC AND DEP_DEBUG) + set(_options "FORWARD_CONFIG") +endif () + orcaslicer_add_cmake_project(Boost + ${_options} URL "https://github.com/boostorg/boost/releases/download/boost-1.84.0/boost-1.84.0.tar.gz" URL_HASH SHA256=4d27e9efed0f6f152dc28db6430b9d3dfb40c0345da7342eaa5a987dde57bd95 LIST_SEPARATOR | diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index dbbf9a0463..26a1860e33 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -155,17 +155,25 @@ if (NOT _is_multi AND NOT CMAKE_BUILD_TYPE) endif () function(orcaslicer_add_cmake_project projectname) - cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN}) + cmake_parse_arguments(P_ARGS "FORWARD_CONFIG" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN}) set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}) if (_is_multi OR MSVC) - if (ORCA_INCLUDE_DEBUG_INFO AND NOT DEP_DEBUG) + if (P_ARGS_FORWARD_CONFIG) + set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}) + elseif (ORCA_INCLUDE_DEBUG_INFO AND NOT DEP_DEBUG) set(_configs_line "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO} -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}") else () set(_configs_line "") endif () endif () + if (P_ARGS_FORWARD_CONFIG) + set(_target_config "$") + else() + set(_target_config "Release") + endif() + if (MSVC) set(_gen CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}") else() @@ -208,8 +216,8 @@ if (NOT IS_CROSS_COMPILE OR NOT APPLE) ${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 + BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${_target_config} -- ${_build_j} + INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${_target_config} ) if (FLATPAK) @@ -251,8 +259,8 @@ else() ${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 + BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${_target_config} -- ${_build_j} + INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${_target_config} ) endif() diff --git a/deps/Draco/Draco.cmake b/deps/Draco/Draco.cmake index 45e349cb19..02ac7efe13 100644 --- a/deps/Draco/Draco.cmake +++ b/deps/Draco/Draco.cmake @@ -1,4 +1,10 @@ +set(_options "") +if (MSVC AND DEP_DEBUG) + set(_options "FORWARD_CONFIG") +endif () + orcaslicer_add_cmake_project(Draco + ${_options} URL https://github.com/google/draco/archive/refs/tags/1.5.7.zip URL_HASH SHA256=27b72ba2d5ff3d0a9814ad40d4cb88f8dc89a35491c0866d952473f8f9416b77 ) \ No newline at end of file diff --git a/deps/OpenCV/OpenCV.cmake b/deps/OpenCV/OpenCV.cmake index 4b3fcf0151..6a76c18137 100644 --- a/deps/OpenCV/OpenCV.cmake +++ b/deps/OpenCV/OpenCV.cmake @@ -1,7 +1,11 @@ if (MSVC) set(_use_IPP "-DWITH_IPP=ON") + if (DEP_DEBUG) + set(_options "FORWARD_CONFIG") + endif () else () set(_use_IPP "-DWITH_IPP=OFF") + set(_options "") endif () if (IN_GIT_REPO) @@ -9,6 +13,7 @@ if (IN_GIT_REPO) endif () orcaslicer_add_cmake_project(OpenCV + ${_options} URL https://github.com/opencv/opencv/archive/refs/tags/4.6.0.tar.gz URL_HASH SHA256=1ec1cba65f9f20fe5a41fda1586e01c70ea0c9a6d7b67c9e13edf0cfe2239277 PATCH_COMMAND git apply ${OpenCV_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-vs.patch ${CMAKE_CURRENT_LIST_DIR}/0002-clang19-macos.patch