diff options
| author | Brad King <brad.king@kitware.com> | 2013-03-04 20:39:50 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-03-04 20:39:50 (GMT) |
| commit | 07ee97cace8c1de04d18a0e671fd4f37514f52be (patch) | |
| tree | f2806cfc52909bcb0eefc4fc86a0d3b72195cbda | |
| parent | b4bb074d8b33077093f26cf594bce4912ade1eec (diff) | |
| parent | add8d22acc9417cb144a0b497f4f5ef330bfc680 (diff) | |
| download | CMake-07ee97cace8c1de04d18a0e671fd4f37514f52be.zip CMake-07ee97cace8c1de04d18a0e671fd4f37514f52be.tar.gz CMake-07ee97cace8c1de04d18a0e671fd4f37514f52be.tar.bz2 | |
Merge topic 'Win-HOST_SYSTEM_PROCESSOR'
add8d22 properly detect processor architecture on Windows
| -rw-r--r-- | Modules/CMakeDetermineSystem.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index c7f9c32..20c1541 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -73,7 +73,11 @@ if(CMAKE_HOST_UNIX) else() if(CMAKE_HOST_WIN32) set (CMAKE_HOST_SYSTEM_NAME "Windows") - set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}") + if (ENV{PROCESSOR_ARCHITEW6432}) + set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITEW6432}") + else() + set (CMAKE_HOST_SYSTEM_PROCESSOR "$ENV{PROCESSOR_ARCHITECTURE}") + endif() endif() endif() |