aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2020-02-06 15:13:45 -0800
committerGitHub <noreply@github.com>2020-02-06 15:13:45 -0800
commitabd170d8e502a0fe6cd55792f207b3aae369d37b (patch)
tree260547ae778378692defd18543f8af8d8efbf731
parentf79396b425ef71e0b5acfab754d50cee22443371 (diff)
parent516bc2419000aa735be693a18abbfe9737b18e17 (diff)
downloadvcpkg-abd170d8e502a0fe6cd55792f207b3aae369d37b.tar.gz
vcpkg-abd170d8e502a0fe6cd55792f207b3aae369d37b.zip
Merge pull request #9820 from sayurin/fix-win32-winnt
[boost-modular-build-helper] fix _WIN32_WINNT definition
-rw-r--r--ports/boost-modular-build-helper/CONTROL2
-rw-r--r--ports/boost-modular-build-helper/boost-modular-build.cmake2
2 files changed, 1 insertions, 3 deletions
diff --git a/ports/boost-modular-build-helper/CONTROL b/ports/boost-modular-build-helper/CONTROL
index 823e81e7f..94ce34b89 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: 1.72.0
+Version: 1.72.0-1
diff --git a/ports/boost-modular-build-helper/boost-modular-build.cmake b/ports/boost-modular-build-helper/boost-modular-build.cmake
index 391f1793c..d5529c127 100644
--- a/ports/boost-modular-build-helper/boost-modular-build.cmake
+++ b/ports/boost-modular-build-helper/boost-modular-build.cmake
@@ -264,8 +264,6 @@ function(boost_modular_build)
string(REPLACE "\\" "/" PLATFORM_WINMD_DIR ${PLATFORM_WINMD_DIR}) # escape backslashes
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")
- else()
- set(TOOLSET_OPTIONS "${TOOLSET_OPTIONS} <compileflags>-D_WIN32_WINNT=0x0602")
endif()
configure_file(${_bm_DIR}/user-config.jam ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/user-config.jam @ONLY)