diff options
| -rw-r--r-- | Modules/CPack.cmake | 53 | ||||
| -rw-r--r-- | Tests/Tutorial/Step7/CMakeLists.txt | 1 |
2 files changed, 28 insertions, 26 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index 15f46fb..59e409f 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -111,37 +111,37 @@ endmacro(cpack_optional_append _list _cond _item) if(NOT CPACK_GENERATOR) if(UNIX) if(CYGWIN) - option(CPACK_CYGWIN_BINARY "Enable to build Cygwin binary packages" ON) + option(CPACK_BINARY_CYGWIN "Enable to build Cygwin binary packages" ON) else(CYGWIN) if(APPLE) - option(CPACK_PACKAGEMAKER "Enable to build PackageMaker packages" ON) - option(CPACK_OSXX11 "Enable to build OSX X11 packages" OFF) + option(CPACK_BINARY_PACKAGEMAKER "Enable to build PackageMaker packages" ON) + option(CPACK_BINARY_OSXX11 "Enable to build OSX X11 packages" OFF) else(APPLE) - option(CPACK_TZ "Enable to build TZ packages" ON) + option(CPACK_BINARY_TZ "Enable to build TZ packages" ON) endif(APPLE) - option(CPACK_STGZ "Enable to build STGZ packages" ON) - option(CPACK_TGZ "Enable to build TGZ packages" ON) - option(CPACK_TBZ2 "Enable to build TBZ2 packages" ON) - option(CPACK_DEB "Enable to build Debian packages" OFF) - option(CPACK_RPM "Enable to build RPM packages" OFF) - option(CPACK_NSIS "Enable to build NSIS 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" ON) + 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(CYGWIN) else(UNIX) - option(CPACK_NSIS "Enable to build NSIS packages" ON) - option(CPACK_ZIP "Enable to build ZIP packages" ON) + option(CPACK_BINARY_NSIS "Enable to build NSIS packages" ON) + option(CPACK_BINARY_ZIP "Enable to build ZIP packages" ON) endif(UNIX) - cpack_optional_append(CPACK_GENERATOR CPACK_PACKAGEMAKER PackageMaker) - cpack_optional_append(CPACK_GENERATOR CPACK_OSXX11 OSXX11) - cpack_optional_append(CPACK_GENERATOR CPACK_CYGWIN_BINARY CygwinBinary) - cpack_optional_append(CPACK_GENERATOR CPACK_DEB DEB) - cpack_optional_append(CPACK_GENERATOR CPACK_RPM RPM) - cpack_optional_append(CPACK_GENERATOR CPACK_NSIS NSIS) - cpack_optional_append(CPACK_GENERATOR CPACK_STGZ STGZ) - cpack_optional_append(CPACK_GENERATOR CPACK_TGZ TGZ) - cpack_optional_append(CPACK_GENERATOR CPACK_TBZ2 TBZ2) - cpack_optional_append(CPACK_GENERATOR CPACK_TZ TZ) - cpack_optional_append(CPACK_GENERATOR CPACK_ZIP ZIP) + 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_NSIS NSIS) + 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_TZ TZ) + cpack_optional_append(CPACK_GENERATOR CPACK_BINARY_ZIP ZIP) endif(NOT CPACK_GENERATOR) @@ -168,9 +168,10 @@ if(NOT CPACK_SOURCE_GENERATOR) endif(NOT CPACK_SOURCE_GENERATOR) # mark the above options as advanced -mark_as_advanced(CPACK_CYGWIN_BINARY CPACK_PACKAGEMAKER CPACK_OSXX11 - CPACK_STGZ CPACK_TGZ CPACK_TBZ2 CPACK_DEB CPACK_RPM - CPACK_TZ CPACK_NSIS CPACK_ZIP +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_NSIS CPACK_BINARY_ZIP CPACK_SOURCE_CYGWIN CPACK_SOURCE_TBZ2 CPACK_SOURCE_TGZ CPACK_SOURCE_TZ CPACK_SOURCE_ZIP) diff --git a/Tests/Tutorial/Step7/CMakeLists.txt b/Tests/Tutorial/Step7/CMakeLists.txt index 826599b..42f73f2 100644 --- a/Tests/Tutorial/Step7/CMakeLists.txt +++ b/Tests/Tutorial/Step7/CMakeLists.txt @@ -75,6 +75,7 @@ include (InstallRequiredSystemLibraries) set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt") set (CPACK_PACKAGE_VERSION_MAJOR "${Tutorial_VERSION_MAJOR}") set (CPACK_PACKAGE_VERSION_MINOR "${Tutorial_VERSION_MINOR}") +set (CPACK_PACKAGE_CONTACT "foo@bar.org") include (CPack) # enable dashboard scripting |