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

Merge topic 'cpack-nsis-win64' 

ecaee7ca CPack: Fix NSIS default 64-bit Windows install directory (#14211)
This commit is contained in:
Brad King 2015-02-05 09:25:10 -05:00 committed by CMake Topic Stage
parent f55a2b2ac2 ecaee7caca
commit 5c29e88972
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/CPack.cmake
View File

@ -352,8 +352,8 @@ if(CPACK_NSIS_MODIFY_PATH)
endif() endif()
set(__cpack_system_name ${CMAKE_SYSTEM_NAME}) set(__cpack_system_name ${CMAKE_SYSTEM_NAME})
if(${__cpack_system_name} MATCHES Windows) if(__cpack_system_name MATCHES "Windows")
if(CMAKE_CL_64) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(__cpack_system_name win64) set(__cpack_system_name win64)
else() else()
set(__cpack_system_name win32) set(__cpack_system_name win32)
@ -363,7 +363,12 @@ cpack_set_if_not_set(CPACK_SYSTEM_NAME "${__cpack_system_name}")
# Root dir: default value should be the string literal "$PROGRAMFILES" # Root dir: default value should be the string literal "$PROGRAMFILES"
# for backwards compatibility. Projects may set this value to anything. # for backwards compatibility. Projects may set this value to anything.
set(__cpack_root_default "$PROGRAMFILES") # When creating 64 bit binaries we set the default value to "$PROGRAMFILES64"
if("x${__cpack_system_name}" STREQUAL "xwin64")
set(__cpack_root_default "$PROGRAMFILES64")
else()
set(__cpack_root_default "$PROGRAMFILES")
endif()
cpack_set_if_not_set(CPACK_NSIS_INSTALL_ROOT "${__cpack_root_default}") cpack_set_if_not_set(CPACK_NSIS_INSTALL_ROOT "${__cpack_root_default}")
# <project>-<major>.<minor>.<patch>-<release>-<platform>.<pkgtype> # <project>-<major>.<minor>.<patch>-<release>-<platform>.<pkgtype>