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

[boost] Fixup DLL names and fix v142 build issues (#6508)

Browse Source 
* [boost-modular-build-helper] Update to 1.70. Fixes #6493.

* [boost-build] Fix boost-build toolset selection for v142
This commit is contained in:
Robert Schumacher 2019-05-21 21:01:13 -07:00 committed by GitHub
parent 33af90d42a
commit 60ecb46561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/boost-modular-build-helper/CONTROL
View File

@ -1,2 +1,2 @@
Source: boost-modular-build-helper
Version: 2019-04-25
Version: 1.70.0-1

4
ports/boost-modular-build-helper/Jamroot.jam
View File

@ -1,5 +1,5 @@
constant BOOST_VERSION : 1.69.0 ;
constant BOOST_VERSION_ABI_TAG : 1_69 ;
constant BOOST_VERSION : 1.70.0 ;
constant BOOST_VERSION_ABI_TAG : 1_70 ;
constant BOOST_JAMROOT_MODULE : $(__name__) ;
import boostcpp ;

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

@ -234,7 +234,7 @@ function(boost_modular_build)
find_path(PATH_TO_CL cl.exe)
find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "${PATH_TO_CL}/../../../lib/x86/store/references" NO_DEFAULT_PATH)
if(PLATFORM_WINMD_DIR MATCHES "NOTFOUND")
message(FATAL_ERROR "Could not find `platform.winmd` in VS2017. Do you have the Universal Windows Platform development workload installed?")
message(FATAL_ERROR "Could not find `platform.winmd` in VS. Do you have the Universal Windows Platform development workload installed?")
endif()
else()
find_path(PLATFORM_WINMD_DIR platform.winmd PATHS "$ENV{VS140COMNTOOLS}/../../VC/LIB/store/references")
@ -253,10 +253,8 @@ function(boost_modular_build)
configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY)
configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/user-config.jam @ONLY)
if(VCPKG_PLATFORM_TOOLSET MATCHES "v141" OR VCPKG_PLATFORM_TOOLSET MATCHES "v142")
list(APPEND _bm_OPTIONS toolset=msvc-14.1)
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
list(APPEND _bm_OPTIONS toolset=msvc-14.0)
if(VCPKG_PLATFORM_TOOLSET MATCHES "v14.")
list(APPEND _bm_OPTIONS toolset=msvc)
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "external")
list(APPEND _bm_OPTIONS toolset=gcc)
else()
@ -351,7 +349,7 @@ function(boost_modular_build)
string(REPLACE "-x64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
string(REPLACE "-a32-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
string(REPLACE "-a64-" "-" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake 3.10 and earlier to locate the binaries
string(REPLACE "-1_69" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
string(REPLACE "-1_70" "" NEW_FILENAME ${NEW_FILENAME}) # To enable CMake > 3.10 to locate the binaries
string(REPLACE "_python3-" "_python-" NEW_FILENAME ${NEW_FILENAME})
if("${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME}" STREQUAL "${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME}")
# nothing to do