diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-05-03 12:55:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 12:55:43 -0700 |
| commit | f821e41de611cb9265575ff47468147ab658d225 (patch) | |
| tree | 2ee1a1b2d015cd2cbbfd5b15cc95a5c50a0cd685 /scripts | |
| parent | d6599a56e9e61a2c572b80d9dca926279ced798e (diff) | |
| parent | eb3d052a52a7c82bf4bcaed2eef8354ce8c0bf0d (diff) | |
| download | vcpkg-f821e41de611cb9265575ff47468147ab658d225.tar.gz vcpkg-f821e41de611cb9265575ff47468147ab658d225.zip | |
Merge pull request #1020 from muemart/fix_arch
Fix processor architecture detection
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cmake/vcpkg_acquire_msys.cmake | 2 | ||||
| -rw-r--r-- | scripts/cmake/vcpkg_configure_cmake.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake index 4bedcf8b5..ee526529b 100644 --- a/scripts/cmake/vcpkg_acquire_msys.cmake +++ b/scripts/cmake/vcpkg_acquire_msys.cmake @@ -2,7 +2,7 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT) set(TOOLPATH ${DOWNLOADS}/tools/msys2) # detect host architecture - if(ENV{PROCESSOR_ARCHITEW6432}) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(_vam_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) else() set(_vam_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE}) diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake index 5eb5d6134..cd979be1b 100644 --- a/scripts/cmake/vcpkg_configure_cmake.cmake +++ b/scripts/cmake/vcpkg_configure_cmake.cmake @@ -5,7 +5,7 @@ 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}) + if(DEFINED ENV{PROCESSOR_ARCHITEW6432}) set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITEW6432}) else() set(_csc_HOST_ARCHITECTURE $ENV{PROCESSOR_ARCHITECTURE}) |