diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-04-23 00:11:42 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-04-23 00:11:42 -0700 |
| commit | 169521070adf69bfb919f7b8f7f7217e0a7488e5 (patch) | |
| tree | 5b3015c29ab323c836c484d68be26351a81369e1 /scripts | |
| parent | 75cdbd398b18b413d55cf76a7286b3681ea0806f (diff) | |
| download | vcpkg-169521070adf69bfb919f7b8f7f7217e0a7488e5.tar.gz vcpkg-169521070adf69bfb919f7b8f7f7217e0a7488e5.zip | |
[vcpkg] Ninja is only 64-bit; do not use on x86
Diffstat (limited to 'scripts')
| -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") |