From 93936d78d221ea49f918f95e33b97796b2a3190f Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Dec 2015 14:28:57 -0500 Subject: Utilities/Release: Avoid repeat copy of files with same suffix --- Utilities/Release/release_cmake.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index c50602d..f41ec9c 100644 --- a/Utilities/Release/release_cmake.cmake +++ b/Utilities/Release/release_cmake.cmake @@ -120,6 +120,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() -- cgit v0.12 From a42bf6c5ddc70e0b15bbf60f11678aae71ff1f56 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Dec 2015 14:30:55 -0500 Subject: Utilities/Release: Add support for copying .msi files --- Utilities/Release/release_cmake.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Utilities/Release/release_cmake.cmake b/Utilities/Release/release_cmake.cmake index f41ec9c..0a3d324 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() -- cgit v0.12 From 4c60e07d857277f1edc45358b35c6f50439324b4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Dec 2015 14:33:40 -0500 Subject: 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. --- CMakeCPackOptions.cmake.in | 4 ++-- 1 file 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@") -- cgit v0.12