diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-28 12:44:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-28 12:44:48 (GMT) |
| commit | 20bd9c267435bbeb50f380c75653535c0c2620fd (patch) | |
| tree | f0c31c8331afc951b1a282306fcb27be900b1341 /Modules | |
| parent | 9e0da9ea2b5340d730a685ff87940a1aedfd66dd (diff) | |
| parent | 561d4b4a47281e715b2868811093e15fd560d307 (diff) | |
| download | CMake-20bd9c267435bbeb50f380c75653535c0c2620fd.zip CMake-20bd9c267435bbeb50f380c75653535c0c2620fd.tar.gz CMake-20bd9c267435bbeb50f380c75653535c0c2620fd.tar.bz2 | |
Merge topic 'vs-generator-platform-install-prefix'
561d4b4a47 VS: Fix CMAKE_INSTALL_PREFIX with GENERATOR_PLATFORM for x64 and ARM
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5272
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeGenericSystem.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/CMakeGenericSystem.cmake b/Modules/CMakeGenericSystem.cmake index 6f665a6..649b6f7 100644 --- a/Modules/CMakeGenericSystem.cmake +++ b/Modules/CMakeGenericSystem.cmake @@ -77,10 +77,14 @@ function(GetDefaultWindowsPrefixBase var) # if("${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)") set(arch_hint "x64") + elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "x64") + set(arch_hint "x64") elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM64") set(arch_hint "ARM64") elseif("${CMAKE_GENERATOR}" MATCHES "ARM") set(arch_hint "ARM") + elseif("${CMAKE_GENERATOR_PLATFORM}" MATCHES "ARM") + set(arch_hint "ARM") elseif("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8") set(arch_hint "x64") elseif("$ENV{LIB}" MATCHES "(amd64|ia64)") |