diff --git a/build_linux.sh b/build_linux.sh index 45f0eebe8e..b23998b185 100755 --- a/build_linux.sh +++ b/build_linux.sh @@ -517,7 +517,7 @@ if [[ -n "${BUILD_DEPS}" ]] ; then fi print_and_run cmake -S deps -B deps/$BUILD_DIR "${CMAKE_C_CXX_COMPILER_CLANG[@]}" "${CMAKE_LLD_LINKER_ARGS[@]}" -G Ninja "${COLORED_OUTPUT}" "${BUILD_ARGS[@]}" - print_and_run cmake --build deps/$BUILD_DIR + print_and_run cmake --build deps/$BUILD_DIR -j1 fi if [[ -n "${BUILD_ORCA}" ]] || [[ -n "${BUILD_TESTS}" ]] ; then diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index a90de994db..13bde6b307 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -166,11 +166,18 @@ function(orcaslicer_add_cmake_project projectname) endif () endif () - set(_gen "") - set(_build_j "-j${NPROC}") if (MSVC) - set(_gen CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}") - set(_build_j "/m") + set(_gen CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}") + else() + set(_gen "") + endif() + + if ($ENV{CMAKE_BUILD_PARALLEL_LEVEL}) + set(_build_j "") # assume environment will control --build parallel setting + elseif(MSVC) + set(_build_j "/m") + else() + set(_build_j "-j${NPROC}") endif () if (NOT IS_CROSS_COMPILE OR NOT APPLE)