GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-12 17:49:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Deal with multithreaded builds of individual projects

Browse Source
This commit is contained in:
tamasmeszaros 2023-08-10 17:10:17 +02:00
parent b4419226ec
commit 23b01929f7
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
cmake/modules/AddCMakeProject.cmake
View File

@ -1,4 +1,5 @@
include(ExternalProject) include(ExternalProject)
include(ProcessorCount)
set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory") set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Path for downloaded source packages.") set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH "Path for downloaded source packages.")
@ -13,7 +14,21 @@ endif ()
# The value of CMAKE_BUILD_TYPE will be used for building each dependency even if the # The value of CMAKE_BUILD_TYPE will be used for building each dependency even if the
# generator is multi-config. Use this var to specify build type regardless of the generator. # generator is multi-config. Use this var to specify build type regardless of the generator.
function(add_cmake_project projectname) function(add_cmake_project projectname)
cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN}) cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND;MAX_THREADS" "CMAKE_ARGS" ${ARGN})
set(_pcount ${P_ARGS_MAX_THREADS})
if (NOT _pcount)
ProcessorCount(_pcount)
endif ()
if (_pcount EQUAL 0)
set(_pcount 1)
endif ()
set(_build_j "-j${_pcount}")
if (CMAKE_GENERATOR MATCHES "Visual Studio")
set(_build_j "/m:${_pcount}")
endif ()
set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}) set(_configs_line -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
if (_is_multi) if (_is_multi)
@ -38,7 +53,7 @@ function(add_cmake_project projectname)
${DEP_CMAKE_OPTS} ${DEP_CMAKE_OPTS}
${P_ARGS_CMAKE_ARGS} ${P_ARGS_CMAKE_ARGS}
${P_ARGS_UNPARSED_ARGUMENTS} ${P_ARGS_UNPARSED_ARGUMENTS}
BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE} -- ${_build_j}
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE} INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE}
) )

2
deps/+OCCT/OCCT.cmake vendored
View File

@ -1,4 +1,6 @@
add_cmake_project(OCCT add_cmake_project(OCCT
MAX_THREADS 4 # Avoid extreme memory usage
#LMBBS: changed version to 7.6.2 #LMBBS: changed version to 7.6.2
URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_2.zip URL https://github.com/Open-Cascade-SAS/OCCT/archive/refs/tags/V7_6_2.zip
URL_HASH SHA256=c696b923593e8c18d059709717dbf155b3e72fdd283c8522047a790ec3a432c5 URL_HASH SHA256=c696b923593e8c18d059709717dbf155b3e72fdd283c8522047a790ec3a432c5