mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 11:39:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[boost-modular-build-helper] Fix repeat building issue on linux and osx (#15265)

Browse Source
This commit is contained in:
Phoebe 2020-12-28 17:28:44 -08:00 committed by GitHub
parent 59c519f93b
commit d1e64a013e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ports/boost-modular-build-helper/boost-modular-build.cmake
View File

@ -116,7 +116,7 @@ function(boost_modular_build)
set(VARIANT ${BUILD_TYPE})
set(BUILD_LIB_PATH ${BUILD_LIB_PATH})
configure_file(${_bm_DIR}/Jamroot.jam ${_bm_SOURCE_PATH}/Jamroot.jam @ONLY)
set(configure_option)
if(DEFINED _bm_BOOST_CMAKE_FRAGMENT)
list(APPEND configure_option "-DBOOST_CMAKE_FRAGMENT=${_bm_BOOST_CMAKE_FRAGMENT}")
@ -135,13 +135,23 @@ function(boost_modular_build)
)
vcpkg_install_cmake()
endfunction()
if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
set(build_flag 0)
if(NOT DEFINED VCPKG_BUILD_TYPE)
set(build_flag 1)
set(VCPKG_BUILD_TYPE "release")
endif()
if(VCPKG_BUILD_TYPE STREQUAL "release")
unix_build(${BOOST_LIB_RELEASE_SUFFIX} "release" "lib/")
endif()
if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
if(build_flag)
set(VCPKG_BUILD_TYPE "debug")
endif()
if(VCPKG_BUILD_TYPE STREQUAL "debug")
unix_build(${BOOST_LIB_DEBUG_SUFFIX} "debug" "debug/lib/")
endif()