diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-24 22:55:06 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-24 22:55:06 -0700 |
| commit | c07e3b26f285e6dc9ed2ab522c300d725da95be4 (patch) | |
| tree | 46ea80c4ae0d63b97b2e006518dc22f5f5fafd11 /scripts/cmake | |
| parent | 3f82a3b85d0b3a9147d81147d1c90bd35125a5f7 (diff) | |
| parent | 169521070adf69bfb919f7b8f7f7217e0a7488e5 (diff) | |
| download | vcpkg-c07e3b26f285e6dc9ed2ab522c300d725da95be4.tar.gz vcpkg-c07e3b26f285e6dc9ed2ab522c300d725da95be4.zip | |
Merge branch 'x86-disable-ninja'
Diffstat (limited to 'scripts/cmake')
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 81616d72d..5eb5d6134 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -5,9 +5,15 @@ function(vcpkg_configure_cmake) message(FATAL_ERROR "Vcpkg has been updated with VS2017 support, however you need to rebuild vcpkg.exe by re-running bootstrap-vcpkg.bat\n") endif() + if(ENV{PROCESSOR_ARCHITEW6432}) + set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) + else() + set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE}) + endif() + if(_csc_GENERATOR) set(GENERATOR ${_csc_GENERATOR}) - elseif(_csc_PREFER_NINJA AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + elseif(_csc_PREFER_NINJA AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND NOT _csc_HOST_ARCHITECTURE STREQUAL "x86") set(GENERATOR "Ninja") elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v140") set(GENERATOR "Visual Studio 14 2015") |