aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-12-21 02:37:25 -0800
committerRobert Schumacher <roschuma@microsoft.com>2017-12-21 02:38:02 -0800
commit81bb62a8dd0a363157f6e7ba0ac1d27116e796d2 (patch)
tree013bd03a19503a7b0b762230ce1812e2c1682788
parent26b5fe20b367003b65912ca43885a6fd929d5cbe (diff)
downloadvcpkg-81bb62a8dd0a363157f6e7ba0ac1d27116e796d2.tar.gz
vcpkg-81bb62a8dd0a363157f6e7ba0ac1d27116e796d2.zip
[boost] Fix uwp builds on systems with spaces
-rw-r--r--ports/boost-vcpkg-helpers/CONTROL2
-rw-r--r--ports/boost-vcpkg-helpers/boost-modular.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/boost-vcpkg-helpers/CONTROL b/ports/boost-vcpkg-helpers/CONTROL
index d3fc0fc95..3e29eb9f8 100644
--- a/ports/boost-vcpkg-helpers/CONTROL
+++ b/ports/boost-vcpkg-helpers/CONTROL
@@ -1,3 +1,3 @@
Source: boost-vcpkg-helpers
-Version: 2
+Version: 3
Description: a set of vcpkg-internal scripts used to modularize boost
diff --git a/ports/boost-vcpkg-helpers/boost-modular.cmake b/ports/boost-vcpkg-helpers/boost-modular.cmake
index 0d8c8b4cb..8e3ca378b 100644
--- a/ports/boost-vcpkg-helpers/boost-modular.cmake
+++ b/ports/boost-vcpkg-helpers/boost-modular.cmake
@@ -147,7 +147,7 @@ function(boost_modular_build)
file(TO_NATIVE_PATH "${PLATFORM_WINMD_DIR}" PLATFORM_WINMD_DIR)
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")
+ 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()