diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2019-05-21 21:01:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 21:01:13 -0700 |
| commit | 60ecb465615ca7f9589026013ae489766b8356cb (patch) | |
| tree | a43e3a1a762b7bf0465bc648427a7c64683be701 | |
| parent | 33af90d42af68ef343edb00a69b1e11548a9e2e1 (diff) | |
| download | vcpkg-60ecb465615ca7f9589026013ae489766b8356cb.tar.gz vcpkg-60ecb465615ca7f9589026013ae489766b8356cb.zip | |
[boost] Fixup DLL names and fix v142 build issues (#6508)
* [boost-modular-build-helper] Update to 1.70. Fixes #6493.
* [boost-build] Fix boost-build toolset selection for v142
| -rw-r--r-- | ports/boost-modular-build-helper/CONTROL | 2 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/Jamroot.jam | 4 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 10 |
3 files changed, 7 insertions, 9 deletions
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL index 59744faee..51347569e 100644 --- a/ports/boost-modular-build-helper/CONTROL +++ b/ports/boost-modular-build-helper/CONTROL @@ -1,2 +1,2 @@ Source: boost-modular-build-helper
-Version: 2019-04-25
+Version: 1.70.0-1
diff --git a/ports/boost-modular-build-helper/Jamroot.jam b/ports/boost-modular-build-helper/Jamroot.jam index d85c8d662..7721973a9 100644 --- a/ports/boost-modular-build-helper/Jamroot.jam +++ b/ports/boost-modular-build-helper/Jamroot.jam @@ -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 ;
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 8e3b2f324..308212384 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -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
|