diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-03 19:26:30 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-03 19:26:30 (GMT) |
| commit | 68674bd0d795b1d560e8b819251480a753ba9882 (patch) | |
| tree | db448fae4ab974786009ff09a6fea7c052b0137b /Modules/CPackDeb.cmake | |
| parent | bf0c200f0a8f494f3e78465ab8be0763ecdcbb6d (diff) | |
| download | CMake-68674bd0d795b1d560e8b819251480a753ba9882.zip CMake-68674bd0d795b1d560e8b819251480a753ba9882.tar.gz CMake-68674bd0d795b1d560e8b819251480a753ba9882.tar.bz2 | |
ENH: better error messages from the debian package generator
-don't display the cpack help if a generator failed with some problem
-check for cmSystemTools::GetErrorOccuredFlag()
Alex
Diffstat (limited to 'Modules/CPackDeb.cmake')
| -rw-r--r-- | Modules/CPackDeb.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Modules/CPackDeb.cmake b/Modules/CPackDeb.cmake index 4b782c8..8f03f26 100644 --- a/Modules/CPackDeb.cmake +++ b/Modules/CPackDeb.cmake @@ -10,7 +10,7 @@ FIND_PROGRAM(AR_EXECUTABLE ar) IF(NOT AR_EXECUTABLE) # Is there a *NIX out there without ar ? - MESSAGE(FATAL_ERROR "debian package require a ar executable") + MESSAGE(FATAL_ERROR "Debian package requires ar executable") ENDIF(NOT AR_EXECUTABLE) # Let's define the control file found in debian package: @@ -18,13 +18,13 @@ ENDIF(NOT AR_EXECUTABLE) # Package: # debian policy enforce lower case for package name IF(NOT DEBIAN_PACKAGE_NAME) - STRING(TOLOWER ${CPACK_PACKAGE_NAME} DEBIAN_PACKAGE_NAME) + STRING(TOLOWER "${CPACK_PACKAGE_NAME}" DEBIAN_PACKAGE_NAME) ENDIF(NOT DEBIAN_PACKAGE_NAME) # Version: IF(NOT DEBIAN_PACKAGE_VERSION) IF(NOT CPACK_PACKAGE_VERSION) - MESSAGE(FATAL_ERROR "debian package require a package version") + MESSAGE(FATAL_ERROR "Debian package requires a package version") ENDIF(NOT CPACK_PACKAGE_VERSION) SET(DEBIAN_PACKAGE_VERSION ${CPACK_PACKAGE_VERSION}) ENDIF(NOT DEBIAN_PACKAGE_VERSION) @@ -46,7 +46,7 @@ ENDIF(NOT DEBIAN_PACKAGE_DEPENDS) # Maintainer: IF(NOT DEBIAN_PACKAGE_MAINTAINER) IF(NOT CPACK_PACKAGE_CONTACT) - MESSAGE(FATAL_ERROR "debian package require a maintainer for a package") + MESSAGE(FATAL_ERROR "Debian package requires a maintainer for a package, set CPACK_PACKAGE_CONTACT or DEBIAN_PACKAGE_MAINTAINER") ENDIF(NOT CPACK_PACKAGE_CONTACT) SET(DEBIAN_PACKAGE_MAINTAINER ${CPACK_PACKAGE_CONTACT}) ENDIF(NOT DEBIAN_PACKAGE_MAINTAINER) @@ -54,7 +54,7 @@ ENDIF(NOT DEBIAN_PACKAGE_MAINTAINER) # Description: IF(NOT DEBIAN_PACKAGE_DESCRIPTION) IF(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY) - MESSAGE(FATAL_ERROR "debian package require a summary for a package") + MESSAGE(FATAL_ERROR "Debian package requires a summary for a package, set CPACK_PACKAGE_DESCRIPTION_SUMMARY or DEBIAN_PACKAGE_DESCRIPTION") ENDIF(NOT CPACK_PACKAGE_DESCRIPTION_SUMMARY) SET(DEBIAN_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY}) ENDIF(NOT DEBIAN_PACKAGE_DESCRIPTION) |