CMake: Fix WiX-generated .msi package file name convention

Update our configuration of the CPack WIX generator for CMake itself to
produce file names consistent with other CPack generators.
This commit is contained in:
Brad King 2015-12-10 14:33:40 -05:00
parent a42bf6c5dd
commit 4c60e07d85

View File

@ -194,9 +194,9 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX")
# Reset CPACK_PACKAGE_VERSION to deal with WiX restriction. # Reset CPACK_PACKAGE_VERSION to deal with WiX restriction.
# But the file names still use the full CMake_VERSION value: # But the file names still use the full CMake_VERSION value:
set(CPACK_PACKAGE_FILE_NAME set(CPACK_PACKAGE_FILE_NAME
"${CPACK_PACKAGE_NAME}-@CMake_VERSION@-${CPACK_SYSTEM_NAME}") "cmake-@CMake_VERSION@-${CPACK_SYSTEM_NAME}")
set(CPACK_SOURCE_PACKAGE_FILE_NAME set(CPACK_SOURCE_PACKAGE_FILE_NAME
"${CPACK_PACKAGE_NAME}-@CMake_VERSION@-Source") "cmake-@CMake_VERSION@")
if(NOT CPACK_WIX_SIZEOF_VOID_P) if(NOT CPACK_WIX_SIZEOF_VOID_P)
set(CPACK_WIX_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@") set(CPACK_WIX_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")