From b7ac63e1c199e72a7af85125030ae369671a02b4 Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Sun, 18 Sep 2011 12:46:29 +0200
Subject: [PATCH 1/2] Fix typos in FeatureSummary.cmake (#12462)

Patch by Yury Kudrashov

Alex
---
 Modules/FeatureSummary.cmake | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 885762ae9..2a09c41de 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.
 #
@@ -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"

From 0ba98533d07641cac73a1a5ba4b86e4fb131c126 Mon Sep 17 00:00:00 2001
From: Alex Neundorf <neundorf@kde.org>
Date: Sun, 18 Sep 2011 12:51:05 +0200
Subject: [PATCH 2/2] Don't warn when setting a property multiple times to the
 same value #12464

Patch by Yury Kudryashov

Alex
---
 Modules/FeatureSummary.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 2a09c41de..eb10cbc94 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -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()