diff options
| author | Matej Hribernik <matej.hribernik@comtrade.com> | 2011-06-19 18:42:42 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2011-06-20 12:31:13 (GMT) |
| commit | aed92ccea6321d0323a84d9001c489ef5d05d350 (patch) | |
| tree | 652208a392c561de4811f1dad357638fd71d5f38 /Modules | |
| parent | d44c68f39e5b46324898ce4ad0b12c63095b1b40 (diff) | |
| download | CMake-aed92ccea6321d0323a84d9001c489ef5d05d350.zip CMake-aed92ccea6321d0323a84d9001c489ef5d05d350.tar.gz CMake-aed92ccea6321d0323a84d9001c489ef5d05d350.tar.bz2 | |
Add VisualStudio 9 and 10 generators for Itanium platform
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeGenericSystem.cmake | 2 | ||||
| -rw-r--r-- | Modules/Platform/Windows-cl.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake index 6615849..6cd8fe6 100644 --- a/Modules/CMakeGenericSystem.cmake +++ b/Modules/CMakeGenericSystem.cmake @@ -73,7 +73,7 @@ function(GetDefaultWindowsPrefixBase var) # the architecture of the targets being built to choose the right # default value for CMAKE_INSTALL_PREFIX. # - if("${CMAKE_GENERATOR}" MATCHES "Win64") + if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)") set(arch_hint "x64") elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") set(arch_hint "x64") diff --git a/Modules/Platform/Windows-cl.cmake b/Modules/Platform/Windows-cl.cmake index 56582ff..ccccbc9 100644 --- a/Modules/Platform/Windows-cl.cmake +++ b/Modules/Platform/Windows-cl.cmake @@ -132,9 +132,9 @@ IF(MSVC_C_ARCHITECTURE_ID MATCHES 64) ELSE(MSVC_C_ARCHITECTURE_ID MATCHES 64) SET(CMAKE_CL_64 0) ENDIF(MSVC_C_ARCHITECTURE_ID MATCHES 64) -IF(CMAKE_FORCE_WIN64) +IF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) SET(CMAKE_CL_64 1) -ENDIF(CMAKE_FORCE_WIN64) +ENDIF(CMAKE_FORCE_WIN64 OR CMAKE_FORCE_IA64) IF("${MSVC_VERSION}" GREATER 1599) SET(MSVC_INCREMENTAL_DEFAULT ON) |