diff options
| author | Alex Neundorf <neundorf@kde.org> | 2011-07-17 14:03:38 (GMT) |
|---|---|---|
| committer | Alex Neundorf <neundorf@kde.org> | 2011-07-17 14:03:38 (GMT) |
| commit | 0671a029205763845e5fd21ce5f69fbe8b0b2c45 (patch) | |
| tree | 97d6eba31ec222930d34eedacdb3c94f1675d329 /Modules/FeatureSummary.cmake | |
| parent | aae13f4c8ea652f437b096b9017bd76ed62fd44d (diff) | |
| download | CMake-0671a029205763845e5fd21ce5f69fbe8b0b2c45.zip CMake-0671a029205763845e5fd21ce5f69fbe8b0b2c45.tar.gz CMake-0671a029205763845e5fd21ce5f69fbe8b0b2c45.tar.bz2 | |
FeatureSummary.cmake: remove "comment" field
What was given as comment to set_package_info(), now goes into
the PURPOSE field. It was not clear what the comment should contain,
with the PURPOSE this is much clearer now.
Alex
Diffstat (limited to 'Modules/FeatureSummary.cmake')
| -rw-r--r-- | Modules/FeatureSummary.cmake | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index 91f4ecb..a461012 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -60,7 +60,7 @@ # message(STATUS "${enabledFeaturesText}") # # -# SET_PACKAGE_INFO(<name> <description> [<url> [<comment>] ] ) +# SET_PACKAGE_INFO(<name> <description> [<url> [<purpose>] ] ) # Use this macro to set up information about the named package, which can # then be displayed via FEATURE_SUMMARY(). # This can be done either directly in the Find-module or in the project @@ -99,8 +99,8 @@ # PRINT_DISABLED_FEATURES() # Does the same as FEATURE_SUMMARY(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:") # -# SET_FEATURE_INFO(<name> <description> [<url> [<comment>] ] ) -# Does the same as SET_PACKAGE_INFO(<name> <description> <url> <comment> ) +# SET_FEATURE_INFO(<name> <description> [<url>] ) +# Does the same as SET_PACKAGE_INFO(<name> <description> <url> ) #============================================================================= # Copyright 2007-2009 Kitware, Inc. @@ -136,14 +136,14 @@ ENDFUNCTION(SET_FEATURE_INFO) FUNCTION(SET_PACKAGE_INFO _name _desc) SET(_url "${ARGV2}") - SET(_comment "${ARGV3}") + SET(_purpose "${ARGV3}") SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_DESCRIPTION "${_desc}" ) IF(_url MATCHES ".+") SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_URL "${_url}" ) - ENDIF(_url MATCHES ".+") - IF(_comment MATCHES ".+") - SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_COMMENT "${_comment}" ) - ENDIF(_comment MATCHES ".+") + ENDIF() + IF(_purpose MATCHES ".+") + SET_PROPERTY(GLOBAL APPEND PROPERTY _CMAKE_${_name}_PURPOSE "${_purpose}" ) + ENDIF() ENDFUNCTION(SET_PACKAGE_INFO) @@ -252,10 +252,6 @@ FUNCTION(_FS_GET_FEATURE_SUMMARY _property _var) IF(_info) SET(_currentFeatureText "${_currentFeatureText} , <${_info}>") ENDIF(_info) - GET_PROPERTY(_info GLOBAL PROPERTY _CMAKE_${_currentFeature}_COMMENT) - IF(_info) - SET(_currentFeatureText "${_currentFeatureText} , ${_info}") - ENDIF(_info) GET_PROPERTY(_info GLOBAL PROPERTY _CMAKE_${_currentFeature}_PURPOSE) FOREACH(_purpose ${_info}) |