diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2020-12-16 15:02:24 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 15:02:24 -0800 |
| commit | 981e65ce0ac1f6c86e5a5ded7824db8780173c76 (patch) | |
| tree | 6b2e40bc21eb26213de1558f04c0ef7adc905831 | |
| parent | 30767175d52d9667ce37d96fe1a7d1438dc94ea1 (diff) | |
| download | vcpkg-981e65ce0ac1f6c86e5a5ded7824db8780173c76.tar.gz vcpkg-981e65ce0ac1f6c86e5a5ded7824db8780173c76.zip | |
[boost-modular-build-helper] Specify msvc version in user-config.jam (#15137)
| -rw-r--r-- | ports/boost-modular-build-helper/boost-modular-build.cmake | 14 | ||||
| -rw-r--r-- | ports/boost-modular-build-helper/user-config.jam | 2 |
2 files changed, 11 insertions, 5 deletions
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake index 06cebed39..67ad37248 100644 --- a/ports/boost-modular-build-helper/boost-modular-build.cmake +++ b/ports/boost-modular-build-helper/boost-modular-build.cmake @@ -318,13 +318,16 @@ function(boost_modular_build) set(TOOLSET_OPTIONS "${TOOLSET_OPTIONS} <cflags>-Zl <compileflags> /AI\"${PLATFORM_WINMD_DIR}\" <linkflags>WindowsApp.lib <cxxflags>/ZW <compileflags>-DVirtualAlloc=VirtualAllocFromApp <compileflags>-D_WIN32_WINNT=0x0A00")
endif()
- 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)
-
+ set(MSVC_VERSION)
if(VCPKG_PLATFORM_TOOLSET MATCHES "v142")
list(APPEND _bm_OPTIONS toolset=msvc)
- elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v14.")
+ set(MSVC_VERSION 14.2)
+ elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+ list(APPEND _bm_OPTIONS toolset=msvc)
+ set(MSVC_VERSION 14.1)
+ elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v140")
list(APPEND _bm_OPTIONS toolset=msvc)
+ set(MSVC_VERSION 14.0)
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "v120")
list(APPEND _bm_OPTIONS toolset=msvc)
elseif(VCPKG_PLATFORM_TOOLSET MATCHES "external")
@@ -333,6 +336,9 @@ function(boost_modular_build) message(FATAL_ERROR "Unsupported value for VCPKG_PLATFORM_TOOLSET: '${VCPKG_PLATFORM_TOOLSET}'")
endif()
+ 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)
+
######################
# Perform build + Package
######################
diff --git a/ports/boost-modular-build-helper/user-config.jam b/ports/boost-modular-build-helper/user-config.jam index 3290a86e0..cb0e53700 100644 --- a/ports/boost-modular-build-helper/user-config.jam +++ b/ports/boost-modular-build-helper/user-config.jam @@ -2,7 +2,7 @@ import toolset ; if "@VCPKG_PLATFORM_TOOLSET@" != "external"
{
- using msvc : : cl.exe
+ using msvc : @MSVC_VERSION@ : cl.exe
:
<setup>"@NOTHING_BAT@"
@TOOLSET_OPTIONS@
|