This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 65b3b57e0b5d3c9e8f0b8fff5fa336c00a3e1644 (commit)
via 4c60e07d857277f1edc45358b35c6f50439324b4 (commit)
via a42bf6c5ddc70e0b15bbf60f11678aae71ff1f56 (commit)
via 93936d78d221ea49f918f95e33b97796b2a3190f (commit)
from 68f9dcba60f873d3091a1201a88dfdc2e26a1bb1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=65b3b57e0b5d3c9e8f0b8fff5fa336c00a3e1644
commit 65b3b57e0b5d3c9e8f0b8fff5fa336c00a3e1644
Merge: 68f9dcb 4c60e07
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Dec 10 14:35:20 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Dec 10 14:35:20 2015 -0500
Merge topic 'release-wix-config' into next
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
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c60e07d857277f1edc45358b35c6f50439324b4
commit 4c60e07d857277f1edc45358b35c6f50439324b4
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Dec 10 14:33:40 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Dec 10 14:33:40 2015 -0500
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.
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@")
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a42bf6c5ddc70e0b15bbf60f11678aae71ff1f56
commit a42bf6c5ddc70e0b15bbf60f11678aae71ff1f56
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Dec 10 14:30:55 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Dec 10 14:30:55 2015 -0500
Utilities/Release: Add support for copying .msi files
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()
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93936d78d221ea49f918f95e33b97796b2a3190f
commit 93936d78d221ea49f918f95e33b97796b2a3190f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Dec 10 14:28:57 2015 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Dec 10 14:29:37 2015 -0500
Utilities/Release: Avoid repeat copy of files with same suffix
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()
-----------------------------------------------------------------------
Summary of changes:
CMakeCPackOptions.cmake.in | 4 ++--
Utilities/Release/release_cmake.cmake | 7 +++++++
2 files changed, 9 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
