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

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
This commit is contained in:
Brad King 2015-12-11 09:43:54 -05:00 committed by CMake Topic Stage
parent 198e7df97e 4c60e07d85
commit 57d5628fd9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeCPackOptions.cmake.in
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@")

7
Utilities/Release/release_cmake.cmake
View File

@ -112,6 +112,9 @@ foreach(gen ${generators})
if("${gen}" STREQUAL "TZ") if("${gen}" STREQUAL "TZ")
set(SUFFIXES ${SUFFIXES} "*.tar.Z") set(SUFFIXES ${SUFFIXES} "*.tar.Z")
endif() endif()
if("${gen}" STREQUAL "WIX")
set(SUFFIXES ${SUFFIXES} "*.msi")
endif()
if("${gen}" STREQUAL "ZIP") if("${gen}" STREQUAL "ZIP")
set(SUFFIXES ${SUFFIXES} "*.zip") set(SUFFIXES ${SUFFIXES} "*.zip")
endif() endif()
@ -120,6 +123,10 @@ foreach(gen ${generators})
endif() endif()
endforeach() endforeach()
if(SUFFIXES)
list(REMOVE_DUPLICATES SUFFIXES)
endif()
if(LOCAL_DIR) if(LOCAL_DIR)
file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${LOCAL_DIR}") file(MAKE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${LOCAL_DIR}")
else() else()