[Cmake-commits] CMake branch, next, updated. v3.0.0-4687-gb6bb564
Brad King
brad.king at kitware.com
Thu Jul 31 10:25:39 EDT 2014
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 b6bb564f94488d04428479076bdfc3c220ad4a81 (commit)
via 58f3d96d178fe42958cd9eb3cb08df96bbd80200 (commit)
via efb45007f9bdd86efdbe27df75ece1043b3a075e (commit)
from a2573c45615d79773455bb9dc75c35c2bc059b74 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b6bb564f94488d04428479076bdfc3c220ad4a81
commit b6bb564f94488d04428479076bdfc3c220ad4a81
Merge: a2573c4 58f3d96
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 31 10:25:38 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 31 10:25:38 2014 -0400
Merge topic 'cpack-options-sort' into next
58f3d96d CPack: Sort packaging options lexicographically
efb45007 CPack: Expand mark_as_advanced arguments to one-per-line
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=58f3d96d178fe42958cd9eb3cb08df96bbd80200
commit 58f3d96d178fe42958cd9eb3cb08df96bbd80200
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 31 10:24:59 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 31 10:24:59 2014 -0400
CPack: Sort packaging options lexicographically
This will allow new options to be added more cleanly.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index cb91e99..35259c4 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -418,44 +418,44 @@ if(NOT CPACK_GENERATOR)
if(APPLE)
option(CPACK_BINARY_BUNDLE "Enable to build OSX bundles" OFF)
option(CPACK_BINARY_DRAGNDROP "Enable to build OSX Drag And Drop package" OFF)
- option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" OFF)
option(CPACK_BINARY_OSXX11 "Enable to build OSX X11 packages" OFF)
+ option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" OFF)
else()
option(CPACK_BINARY_TZ "Enable to build TZ packages" ON)
endif()
+ option(CPACK_BINARY_DEB "Enable to build Debian packages" OFF)
+ option(CPACK_BINARY_NSIS "Enable to build NSIS packages" OFF)
+ option(CPACK_BINARY_RPM "Enable to build RPM packages" OFF)
option(CPACK_BINARY_STGZ "Enable to build STGZ packages" ON)
- option(CPACK_BINARY_TGZ "Enable to build TGZ packages" ON)
option(CPACK_BINARY_TBZ2 "Enable to build TBZ2 packages" OFF)
+ option(CPACK_BINARY_TGZ "Enable to build TGZ packages" ON)
option(CPACK_BINARY_TXZ "Enable to build TXZ packages" OFF)
- option(CPACK_BINARY_DEB "Enable to build Debian packages" OFF)
- option(CPACK_BINARY_RPM "Enable to build RPM packages" OFF)
- option(CPACK_BINARY_NSIS "Enable to build NSIS packages" OFF)
endif()
else()
+ option(CPACK_BINARY_7Z "Enable to build 7-Zip packages" OFF)
option(CPACK_BINARY_NSIS "Enable to build NSIS packages" ON)
option(CPACK_BINARY_WIX "Enable to build WiX packages" OFF)
option(CPACK_BINARY_ZIP "Enable to build ZIP packages" OFF)
- option(CPACK_BINARY_7Z "Enable to build 7-Zip packages" OFF)
endif()
option(CPACK_BINARY_IFW "Enable to build IFW packages" OFF)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_7Z 7Z)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_BUNDLE Bundle)
- cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_DRAGNDROP DragNDrop)
- cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PACKAGEMAKER PackageMaker)
- cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_OSXX11 OSXX11)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_CYGWIN CygwinBinary)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_DEB DEB)
- cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_RPM RPM)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_DRAGNDROP DragNDrop)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_IFW IFW)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_NSIS NSIS)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_OSXX11 OSXX11)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_PACKAGEMAKER PackageMaker)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_RPM RPM)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_STGZ STGZ)
- cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TGZ TGZ)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TBZ2 TBZ2)
+ cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TGZ TGZ)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TXZ TXZ)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_TZ TZ)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_WIX WIX)
cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_ZIP ZIP)
- cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_IFW IFW)
- cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_7Z 7Z)
endif()
@@ -472,45 +472,45 @@ if(NOT CPACK_SOURCE_GENERATOR)
option(CPACK_SOURCE_ZIP "Enable to build ZIP source packages" OFF)
endif()
else()
- option(CPACK_SOURCE_ZIP "Enable to build ZIP source packages" ON)
option(CPACK_SOURCE_7Z "Enable to build 7-Zip source packages" ON)
+ option(CPACK_SOURCE_ZIP "Enable to build ZIP source packages" ON)
endif()
+ cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_7Z 7Z)
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_CYGWIN CygwinSource)
- cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TGZ TGZ)
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TBZ2 TBZ2)
+ cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TGZ TGZ)
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TXZ TXZ)
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_TZ TZ)
cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_ZIP ZIP)
- cpack_optional_append(CPACK_SOURCE_GENERATOR CPACK_SOURCE_7Z 7Z)
endif()
# mark the above options as advanced
mark_as_advanced(
+ CPACK_BINARY_7Z
+ CPACK_BINARY_BUNDLE
CPACK_BINARY_CYGWIN
- CPACK_BINARY_PACKAGEMAKER
+ CPACK_BINARY_DEB
+ CPACK_BINARY_DRAGNDROP
+ CPACK_BINARY_IFW
+ CPACK_BINARY_NSIS
CPACK_BINARY_OSXX11
+ CPACK_BINARY_PACKAGEMAKER
+ CPACK_BINARY_RPM
CPACK_BINARY_STGZ
- CPACK_BINARY_TGZ
CPACK_BINARY_TBZ2
- CPACK_BINARY_DEB
- CPACK_BINARY_RPM
- CPACK_BINARY_TZ
+ CPACK_BINARY_TGZ
CPACK_BINARY_TXZ
- CPACK_BINARY_7Z
- CPACK_BINARY_NSIS
+ CPACK_BINARY_TZ
CPACK_BINARY_WIX
CPACK_BINARY_ZIP
- CPACK_BINARY_BUNDLE
- CPACK_BINARY_IFW
+ CPACK_SOURCE_7Z
CPACK_SOURCE_CYGWIN
CPACK_SOURCE_TBZ2
CPACK_SOURCE_TGZ
CPACK_SOURCE_TXZ
- CPACK_SOURCE_7Z
CPACK_SOURCE_TZ
CPACK_SOURCE_ZIP
- CPACK_BINARY_DRAGNDROP
)
# Set some other variables
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=efb45007f9bdd86efdbe27df75ece1043b3a075e
commit efb45007f9bdd86efdbe27df75ece1043b3a075e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Jul 31 10:23:38 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Jul 31 10:24:03 2014 -0400
CPack: Expand mark_as_advanced arguments to one-per-line
This will allow new values to be added without editing existing lines.
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake
index d9e1694..cb91e99 100644
--- a/Modules/CPack.cmake
+++ b/Modules/CPack.cmake
@@ -486,15 +486,32 @@ if(NOT CPACK_SOURCE_GENERATOR)
endif()
# mark the above options as advanced
-mark_as_advanced(CPACK_BINARY_CYGWIN CPACK_BINARY_PACKAGEMAKER CPACK_BINARY_OSXX11
- CPACK_BINARY_STGZ CPACK_BINARY_TGZ CPACK_BINARY_TBZ2
- CPACK_BINARY_DEB CPACK_BINARY_RPM CPACK_BINARY_TZ
- CPACK_BINARY_TXZ CPACK_BINARY_7Z
- CPACK_BINARY_NSIS CPACK_BINARY_WIX CPACK_BINARY_ZIP CPACK_BINARY_BUNDLE
- CPACK_BINARY_IFW
- CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ
- CPACK_SOURCE_TXZ CPACK_SOURCE_7Z
- CPACK_SOURCE_TZ CPACK_SOURCE_ZIP CPACK_BINARY_DRAGNDROP)
+mark_as_advanced(
+ CPACK_BINARY_CYGWIN
+ CPACK_BINARY_PACKAGEMAKER
+ CPACK_BINARY_OSXX11
+ CPACK_BINARY_STGZ
+ CPACK_BINARY_TGZ
+ CPACK_BINARY_TBZ2
+ CPACK_BINARY_DEB
+ CPACK_BINARY_RPM
+ CPACK_BINARY_TZ
+ CPACK_BINARY_TXZ
+ CPACK_BINARY_7Z
+ CPACK_BINARY_NSIS
+ CPACK_BINARY_WIX
+ CPACK_BINARY_ZIP
+ CPACK_BINARY_BUNDLE
+ CPACK_BINARY_IFW
+ CPACK_SOURCE_CYGWIN
+ CPACK_SOURCE_TBZ2
+ CPACK_SOURCE_TGZ
+ CPACK_SOURCE_TXZ
+ CPACK_SOURCE_7Z
+ CPACK_SOURCE_TZ
+ CPACK_SOURCE_ZIP
+ CPACK_BINARY_DRAGNDROP
+ )
# Set some other variables
cpack_set_if_not_set(CPACK_INSTALL_CMAKE_PROJECTS
-----------------------------------------------------------------------
Summary of changes:
Modules/CPack.cmake | 67 ++++++++++++++++++++++++++++++++-------------------
1 file changed, 42 insertions(+), 25 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list