diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-20 18:42:21 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-09-20 18:42:21 (GMT) |
| commit | d622088b2b55da24c76361712fad746c911617f1 (patch) | |
| tree | 9ac40f97706ac642b191e706f16e2263b961677d | |
| parent | f628f12799fcecf16b8095524f5bbbabc3bec5d7 (diff) | |
| parent | 0ba98533d07641cac73a1a5ba4b86e4fb131c126 (diff) | |
| download | CMake-d622088b2b55da24c76361712fad746c911617f1.zip CMake-d622088b2b55da24c76361712fad746c911617f1.tar.gz CMake-d622088b2b55da24c76361712fad746c911617f1.tar.bz2 | |
Merge topic 'MinorFeatureSummaryFixes'
0ba9853 Don't warn when setting a property multiple times to the same value #12464
b7ac63e Fix typos in FeatureSummary.cmake (#12462)
| -rw-r--r-- | Modules/FeatureSummary.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake index 885762a..eb10cbc 100644 --- a/Modules/FeatureSummary.cmake +++ b/Modules/FeatureSummary.cmake @@ -2,7 +2,7 @@ # # This module provides the macros feature_summary(), set_package_properties() and # add_feature_info(). -# For compatiblity it also still provides set_package_info(), set_feature_info(), +# For compatibility it also still provides set_package_info(), set_feature_info(), # print_enabled_features() and print_disabled_features(). # # These macros can be used to generate a summary of enabled and disabled @@ -130,13 +130,13 @@ # PURPOSE "Enables odt-export in MyWordProcessor") # # find_package(DBUS) -# set_package_properties(LibXml2 PROPERTIES TYPE RUNTIME +# set_package_properties(DBUS PROPERTIES TYPE RUNTIME # PURPOSE "Necessary to disable the screensaver during a presentation" ) # # ADD_FEATURE_INFO(<name> <enabled> <description>) # Use this macro to add information about a feature with the given <name>. # <enabled> contains whether this feature is enabled or not, <description> -# is a text descibing the feature. +# is a text describing the feature. # The information can be displayed using feature_summary() for ENABLED_FEATURES # and DISABLED_FEATURES respectively. # @@ -209,7 +209,7 @@ FUNCTION(SET_PACKAGE_PROPERTIES _name _props) IF(_SPP_DESCRIPTION) GET_PROPERTY(_info GLOBAL PROPERTY _CMAKE_${_name}_DESCRIPTION) - IF(_info) + IF(_info AND NOT "${_info}" STREQUAL "${_SPP_DESCRIPTION}") MESSAGE(STATUS "Warning: Property DESCRIPTION for package ${_name} already set to \"${_info}\", overriding it with \"${_SPP_DESCRIPTION}\"") ENDIF() @@ -219,7 +219,7 @@ FUNCTION(SET_PACKAGE_PROPERTIES _name _props) IF(_SPP_URL) GET_PROPERTY(_info GLOBAL PROPERTY _CMAKE_${_name}_URL) - IF(_info) + IF(_info AND NOT "${_info}" STREQUAL "${_SPP_URL}") MESSAGE(STATUS "Warning: Property URL already set to \"${_info}\", overriding it with \"${_SPP_URL}\"") ENDIF() @@ -344,7 +344,7 @@ FUNCTION(FEATURE_SUMMARY) ENDIF() IF(NOT _FS_WHAT) - MESSAGE(FATAL_ERROR "The call to FEATURE_SUMMAY() doesn't set the required WHAT argument.") + MESSAGE(FATAL_ERROR "The call to FEATURE_SUMMARY() doesn't set the required WHAT argument.") ENDIF() SET(validWhatParts "ENABLED_FEATURES" |