mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 20:46:49 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix processor architecture detection

Browse Source
This commit is contained in:
Martin Müller 2017-05-03 19:11:29 +02:00
parent d75fcbb431
commit eb3d052a52
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/cmake/vcpkg_acquire_msys.cmake
View File

@ -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})

2
scripts/cmake/vcpkg_configure_cmake.cmake
View File

@ -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})