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

Merge branch 'master' into fs_emboss

Browse Source
This commit is contained in:
Filip Sykala 2022-03-30 12:56:28 +02:00
commit 2372fa9493
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
deps/Boost/Boost.cmake vendored
View File

@ -37,6 +37,8 @@ elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
if (WIN32) if (WIN32)
set(_boost_toolset "clang-win") set(_boost_toolset "clang-win")
elseif (APPLE)
set(_boost_toolset "clang")
else() else()
set(_boost_toolset "clang") set(_boost_toolset "clang")
endif() endif()
@ -103,11 +105,16 @@ if (NOT _boost_variants)
set(_boost_variants release) set(_boost_variants release)
endif() endif()
set(_boost_layout system)
if (MSVC)
set(_boost_layout versioned)
endif ()
set(_build_cmd ${_build_cmd} set(_build_cmd ${_build_cmd}
${_boost_flags} ${_boost_flags}
-j${NPROC} -j${NPROC}
${_libs} ${_libs}
--layout=versioned --layout=${_boost_layout}
--debug-configuration --debug-configuration
toolset=${_boost_toolset} toolset=${_boost_toolset}
address-model=${_bits} address-model=${_bits}