diff options
| author | Martin Müller <muemart@users.noreply.github.com> | 2017-05-03 19:11:29 +0200 |
|---|---|---|
| committer | Martin Müller <muemart@users.noreply.github.com> | 2017-05-03 19:11:29 +0200 |
| commit | eb3d052a52a7c82bf4bcaed2eef8354ce8c0bf0d (patch) | |
| tree | 26c8468124e2d84c7b3db52d12ca0ed64aee940b | |
| parent | d75fcbb431e58715c3470e86ec9697948049f24c (diff) | |
| download | vcpkg-eb3d052a52a7c82bf4bcaed2eef8354ce8c0bf0d.tar.gz vcpkg-eb3d052a52a7c82bf4bcaed2eef8354ce8c0bf0d.zip | |
Fix processor architecture detection
| -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}) |