kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'Win-HOST_SYSTEM_PROCESSOR' 

add8d22 properly detect processor architecture on Windows
This commit is contained in:
Brad King 2013-03-04 15:39:50 -05:00 committed by CMake Topic Stage
parent b4bb074d8b add8d22acc
commit 07ee97cace
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Modules/CMakeDetermineSystem.cmake
View File

@ -73,9 +73,13 @@ if(CMAKE_HOST_UNIX)
else() else()
if(CMAKE_HOST_WIN32) if(CMAKE_HOST_WIN32)
set (CMAKE_HOST_SYSTEM_NAME "Windows") set (CMAKE_HOST_SYSTEM_NAME "Windows")
if (ENV{PROCESSOR_ARCHITEW6432})
set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}")
else()
set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}") set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}")
endif() endif()
endif() endif()
endif()
# if a toolchain file is used, the user wants to cross compile. # if a toolchain file is used, the user wants to cross compile.
# in this case read the toolchain file and keep the CMAKE_HOST_SYSTEM_* # in this case read the toolchain file and keep the CMAKE_HOST_SYSTEM_*