[Cmake-commits] CMake branch, next, updated. v3.6.2-1924-ga7316d4
Brad King
brad.king at kitware.com
Sat Sep 10 08:18:59 EDT 2016
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 a7316d4696dc3e6b4d5fae8b09132f0821c2e810 (commit)
via 70324a8882b6a93aef68549b3ccbb427feb908b2 (commit)
from f8fc47db59a6cbd16a4fdd3238e82f8a5561631f (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=a7316d4696dc3e6b4d5fae8b09132f0821c2e810
commit a7316d4696dc3e6b4d5fae8b09132f0821c2e810
Merge: f8fc47d 70324a8
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 10 08:18:58 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Sep 10 08:18:58 2016 -0400
Merge topic 'drop-cygwin-binary' into next
70324a88 fixup! Utilities/Release: Drop Cygwin binary
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=70324a8882b6a93aef68549b3ccbb427feb908b2
commit 70324a8882b6a93aef68549b3ccbb427feb908b2
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sat Sep 10 08:18:43 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sat Sep 10 08:18:43 2016 -0400
fixup! Utilities/Release: Drop Cygwin binary
diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake
index 4d7c6fd..47bb7cf 100644
--- a/CMakeCPack.cmake
+++ b/CMakeCPack.cmake
@@ -190,31 +190,6 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
set(CPACK_PACKAGE_EXECUTABLES "ccmake" "CMake")
endif()
- # cygwin specific packaging stuff
- if(CYGWIN)
- # setup the cygwin package name
- set(CPACK_PACKAGE_NAME cmake)
- # setup the name of the package for cygwin cmake-2.4.3
- set(CPACK_PACKAGE_FILE_NAME
- "${CPACK_PACKAGE_NAME}-${CMake_VERSION}")
- # the source has the same name as the binary
- set(CPACK_SOURCE_PACKAGE_FILE_NAME ${CPACK_PACKAGE_FILE_NAME})
- # Create a cygwin version number in case there are changes for cygwin
- # that are not reflected upstream in CMake
- set(CPACK_CYGWIN_PATCH_NUMBER 1 CACHE STRING "patch number for CMake cygwin packages")
- mark_as_advanced(CPACK_CYGWIN_PATCH_NUMBER)
- # These files are required by the cmCPackCygwinSourceGenerator and the files
- # put into the release tar files.
- set(CPACK_CYGWIN_BUILD_SCRIPT
- "${CMake_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.sh")
- set(CPACK_CYGWIN_PATCH_FILE
- "${CMake_BINARY_DIR}/${CPACK_PACKAGE_FILE_NAME}-${CPACK_CYGWIN_PATCH_NUMBER}.patch")
- # include the sub directory cmake file for cygwin that
- # configures some files and adds some install targets
- # this file uses some of the package file name variables
- include(Utilities/Release/Cygwin/CMakeLists.txt)
- endif()
-
set(CPACK_WIX_UPGRADE_GUID "8ffd1d72-b7f1-11e2-8ee5-00238bca4991")
if(MSVC AND NOT "$ENV{WIX}" STREQUAL "")
-----------------------------------------------------------------------
Summary of changes:
CMakeCPack.cmake | 25 -------------------------
1 file changed, 25 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list