mirror of
https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git
synced 2025-08-16 06:16:12 +08:00
Fix for Boost build on Linux, broken by previous commit
This commit is contained in:
parent
316c030d5e
commit
e1005f5dcc
4
deps/+Boost/Boost.cmake
vendored
4
deps/+Boost/Boost.cmake
vendored
@ -1,11 +1,13 @@
|
|||||||
|
|
||||||
set(_context_abi_line "")
|
set(_context_abi_line "")
|
||||||
|
set(_context_arch_line "")
|
||||||
if (APPLE AND CMAKE_OSX_ARCHITECTURES)
|
if (APPLE AND CMAKE_OSX_ARCHITECTURES)
|
||||||
if (CMAKE_OSX_ARCHITECTURES MATCHES "x86")
|
if (CMAKE_OSX_ARCHITECTURES MATCHES "x86")
|
||||||
set(_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=sysv")
|
set(_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=sysv")
|
||||||
elseif (CMAKE_OSX_ARCHITECTURES MATCHES "arm")
|
elseif (CMAKE_OSX_ARCHITECTURES MATCHES "arm")
|
||||||
set (_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=aapcs")
|
set (_context_abi_line "-DBOOST_CONTEXT_ABI:STRING=aapcs")
|
||||||
endif ()
|
endif ()
|
||||||
|
set(_context_arch_line "-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}")
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
add_cmake_project(Boost
|
add_cmake_project(Boost
|
||||||
@ -15,6 +17,6 @@ add_cmake_project(Boost
|
|||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
-DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
|
-DBOOST_EXCLUDE_LIBRARIES:STRING=contract|fiber|numpy|stacktrace|wave|test
|
||||||
-DBUILD_TESTING:BOOL=OFF
|
-DBUILD_TESTING:BOOL=OFF
|
||||||
-DBOOST_CONTEXT_ARCHITECTURE:STRING=${CMAKE_OSX_ARCHITECTURES}
|
|
||||||
"${_context_abi_line}"
|
"${_context_abi_line}"
|
||||||
|
"${_context_arch_line}"
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user