summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-02-07 20:04:06 (GMT)
committerBrad King <brad.king@kitware.com>2013-02-07 20:04:06 (GMT)
commitfe664b5d1d4c00021197adf504c5f8de81f7cf5a (patch)
tree16bbd52e3d4edaf501a960c1b54cb7bf8a7f1bfe /Modules
parentbc75f4c4c606412429e97d12ef1d550e7096cdfc (diff)
downloadCMake-fe664b5d1d4c00021197adf504c5f8de81f7cf5a.zip
CMake-fe664b5d1d4c00021197adf504c5f8de81f7cf5a.tar.gz
CMake-fe664b5d1d4c00021197adf504c5f8de81f7cf5a.tar.bz2
MSVC: Fix CMAKE_CL_64 in CXX-only projects (#13896)
When CXX is enabled without C then MSVC_CXX_ARCHITECTURE_ID is set instead but not MSVC_C_ARCHITECTURE_ID. Test both.
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Platform/Windows-MSVC.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 3a38d8f..f9df6d8 100644
--- a/Modules/Platform/Windows-MSVC.cmake
+++ b/Modules/Platform/Windows-MSVC.cmake
@@ -107,7 +107,7 @@ if(NOT MSVC_VERSION)
endif()
endif()
-if(MSVC_C_ARCHITECTURE_ID MATCHES 64)
+if(MSVC_C_ARCHITECTURE_ID MATCHES 64 OR MSVC_CXX_ARCHITECTURE_ID MATCHES 64)
set(CMAKE_CL_64 1)
else()
set(CMAKE_CL_64 0)