mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: boost build on macos 

Change-Id: I9ac1f05b93581f5c88cec12291049e77f441cb8b
(cherry picked from commit ebe0a67ffc578035510c3f231a085bd8ebe5b787)
This commit is contained in:
chunmao.guo 2023-02-03 14:14:17 +08:00 committed by Lane.Wei
parent 9bc72ce339
commit ef111ab597
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
deps/Boost/Boost.cmake vendored
View File

@ -35,6 +35,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)
configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam) configure_file(${CMAKE_CURRENT_LIST_DIR}/user-config.jam boost-user-config.jam)
@ -122,8 +124,8 @@ set(_build_cmd ${_build_cmd}
set(_install_cmd ${_build_cmd} --prefix=${_prefix} install) set(_install_cmd ${_build_cmd} --prefix=${_prefix} install)
list(APPEND _patch_command COMMAND git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-Boost-fix.patch)
if (MSVC)
ExternalProject_Add( ExternalProject_Add(
dep_Boost dep_Boost
URL "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.zip" URL "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.zip"
@ -131,24 +133,10 @@ ExternalProject_Add(
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
CONFIGURE_COMMAND "${_bootstrap_cmd}" CONFIGURE_COMMAND "${_bootstrap_cmd}"
PATCH_COMMAND ${_patch_command} PATCH_COMMAND ${_patch_command}
PATCH_COMMAND git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-Boost-fix.patch
BUILD_COMMAND "${_build_cmd}" BUILD_COMMAND "${_build_cmd}"
BUILD_IN_SOURCE ON BUILD_IN_SOURCE ON
INSTALL_COMMAND "${_install_cmd}" INSTALL_COMMAND "${_install_cmd}"
) )
else ()
ExternalProject_Add(
dep_Boost
URL "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.zip"
URL_HASH SHA256=f22143b5528e081123c3c5ed437e92f648fe69748e95fa6e2bd41484e2986cc3
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
CONFIGURE_COMMAND "${_bootstrap_cmd}"
PATCH_COMMAND ${_patch_command} && git init && ${PATCH_CMD} ${CMAKE_CURRENT_LIST_DIR}/0001-Boost-fix.patch
BUILD_COMMAND "${_build_cmd}"
BUILD_IN_SOURCE ON
INSTALL_COMMAND "${_install_cmd}"
)
endif ()
if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
# Patch the boost::polygon library with a custom one. # Patch the boost::polygon library with a custom one.