Commit 0671a029 authored by Alexander Neundorf's avatar Alexander Neundorf
Browse files

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
parent aae13f4c
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
# message(STATUS "${enabledFeaturesText}") # 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 # Use this macro to set up information about the named package, which can
# then be displayed via FEATURE_SUMMARY(). # then be displayed via FEATURE_SUMMARY().
# This can be done either directly in the Find-module or in the project # This can be done either directly in the Find-module or in the project
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
# PRINT_DISABLED_FEATURES() # PRINT_DISABLED_FEATURES()
# Does the same as FEATURE_SUMMARY(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:") # Does the same as FEATURE_SUMMARY(WHAT DISABLED_FEATURES DESCRIPTION "Disabled features:")
# #
# SET_FEATURE_INFO(<name> <description> [<url> [<comment>] ] ) # SET_FEATURE_INFO(<name> <description> [<url>] )
# Does the same as SET_PACKAGE_INFO(<name> <description> <url> <comment> ) # Does the same as SET_PACKAGE_INFO(<name> <description> <url> )
#============================================================================= #=============================================================================
# Copyright 2007-2009 Kitware, Inc. # Copyright 2007-2009 Kitware, Inc.
...@@ -136,14 +136,14 @@ ENDFUNCTION(SET_FEATURE_INFO) ...@@ -136,14 +136,14 @@ ENDFUNCTION(SET_FEATURE_INFO)
FUNCTION(SET_PACKAGE_INFO _name _desc) FUNCTION(SET_PACKAGE_INFO _name _desc)
SET(_url "${ARGV2}") SET(_url "${ARGV2}")
SET(_comment "${ARGV3}") SET(_purpose "${ARGV3}")
SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_DESCRIPTION "${_desc}" ) SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_DESCRIPTION "${_desc}" )
IF(_url MATCHES ".+") IF(_url MATCHES ".+")
SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_URL "${_url}" ) SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_URL "${_url}" )
ENDIF(_url MATCHES ".+") ENDIF()
IF(_comment MATCHES ".+") IF(_purpose MATCHES ".+")
SET_PROPERTY(GLOBAL PROPERTY _CMAKE_${_name}_COMMENT "${_comment}" ) SET_PROPERTY(GLOBAL APPEND PROPERTY _CMAKE_${_name}_PURPOSE "${_purpose}" )
ENDIF(_comment MATCHES ".+") ENDIF()
ENDFUNCTION(SET_PACKAGE_INFO) ENDFUNCTION(SET_PACKAGE_INFO)
...@@ -252,10 +252,6 @@ FUNCTION(_FS_GET_FEATURE_SUMMARY _property _var) ...@@ -252,10 +252,6 @@ FUNCTION(_FS_GET_FEATURE_SUMMARY _property _var)
IF(_info) IF(_info)
SET(_currentFeatureText "${_currentFeatureText} , <${_info}>") SET(_currentFeatureText "${_currentFeatureText} , <${_info}>")
ENDIF(_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) GET_PROPERTY(_info GLOBAL PROPERTY _CMAKE_${_currentFeature}_PURPOSE)
FOREACH(_purpose ${_info}) FOREACH(_purpose ${_info})
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment