diff options
| author | Brad King <brad.king@kitware.com> | 2015-12-11 09:43:54 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-12-11 09:43:54 -0500 |
| commit | 57d5628fd9155a9f7f203ee6d612c6feeb3cc704 (patch) | |
| tree | 8643282e34321fc1d460825c907325586a74049e | |
| parent | 198e7df97e7efafca8a96f448c2712125aa71266 (diff) | |
| parent | 4c60e07d857277f1edc45358b35c6f50439324b4 (diff) | |
| download | cmake-57d5628fd9155a9f7f203ee6d612c6feeb3cc704.tar.gz | |
Merge topic 'release-wix-config'
4c60e07d CMake: Fix WiX-generated .msi package file name convention
a42bf6c5 Utilities/Release: Add support for copying .msi files
93936d78 Utilities/Release: Avoid repeat copy of files with same suffix
| -rw-r--r-- | CMakeCPackOptions.cmake.in | 4 | ||||
| -rw-r--r-- | Utilities/Release/release_cmake.cmake | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index ae006536dc..4ebf30699a 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@") diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index c50602dad5..0a3d324e79 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -112,6 +112,9 @@ foreach(gen ${generators}) if("${gen}" STREQUAL "TZ") set(SUFFIXES ${SUFFIXES} "*.tar.Z") endif() + if("${gen}" STREQUAL "WIX") + set(SUFFIXES ${SUFFIXES} "*.msi") + endif() if("${gen}" STREQUAL "ZIP") set(SUFFIXES ${SUFFIXES} "*.zip") endif() @@ -120,6 +123,10 @@ foreach(gen ${generators}) endif() endforeach() +if(SUFFIXES) + list(REMOVE_DUPLICATES SUFFIXES) +endif() + if(LOCAL_DIR) file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${LOCAL_DIR}") else() |