summaryrefslogtreecommitdiffstats
path: root/CMakeCPackOptions.cmake.in
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-12-10 19:33:40 (GMT)
committerBrad King <brad.king@kitware.com>2015-12-10 19:33:40 (GMT)
commit4c60e07d857277f1edc45358b35c6f50439324b4 (patch)
tree7e65d22aa20a307f244bc5969207dcc32df33f29 /CMakeCPackOptions.cmake.in
parenta42bf6c5ddc70e0b15bbf60f11678aae71ff1f56 (diff)
downloadCMake-4c60e07d857277f1edc45358b35c6f50439324b4.zip
CMake-4c60e07d857277f1edc45358b35c6f50439324b4.tar.gz
CMake-4c60e07d857277f1edc45358b35c6f50439324b4.tar.bz2
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.
Diffstat (limited to 'CMakeCPackOptions.cmake.in')
-rw-r--r--CMakeCPackOptions.cmake.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in
index ae00653..4ebf306 100644
--- a/CMakeCPackOptions.cmake.in
+++ b/CMakeCPackOptions.cmake.in
@@ -194,9 +194,9 @@ if("${CPACK_GENERATOR}" STREQUAL "WIX")
# Reset CPACK_PACKAGE_VERSION to deal with WiX restriction.
# But the file names still use the full CMake_VERSION value:
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
- "${CPACK_PACKAGE_NAME}-@CMake_VERSION@-Source")
+ "cmake-@CMake_VERSION@")
if(NOT CPACK_WIX_SIZEOF_VOID_P)
set(CPACK_WIX_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")