[Cmake-commits] CMake branch, next, updated. v2.8.5-1913-g49807b4

[Alexander Neundorf]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  49807b451540af0f3c3cf7cf2e20d81b89e4dcbf (commit)
       via  0ba98533d07641cac73a1a5ba4b86e4fb131c126 (commit)
       via  b7ac63e1c199e72a7af85125030ae369671a02b4 (commit)
       via  f1cd7d289e7e9881a17cbb9de025313a86391be8 (commit)
      from  1a0f4aa9e9c7edf8880240c6a7654ea07a6c77dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49807b451540af0f3c3cf7cf2e20d81b89e4dcbf
commit 49807b451540af0f3c3cf7cf2e20d81b89e4dcbf
Merge: 1a0f4aa 0ba9853
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Sun Sep 18 07:02:33 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Sep 18 07:02:33 2011 -0400

    Merge topic 'MinorFeatureSummaryFixes' into next
    
    0ba9853 Don't warn when setting a property multiple times to the same value #12464
    b7ac63e Fix typos in FeatureSummary.cmake (#12462)
    f1cd7d2 KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ba98533d07641cac73a1a5ba4b86e4fb131c126
commit 0ba98533d07641cac73a1a5ba4b86e4fb131c126
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Sep 18 12:51:05 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Sep 18 12:51:05 2011 +0200

    Don't warn when setting a property multiple times to the same value #12464
    
    Patch by Yury Kudryashov
    
    Alex

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 2a09c41..eb10cbc 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()
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7ac63e1c199e72a7af85125030ae369671a02b4
commit b7ac63e1c199e72a7af85125030ae369671a02b4
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Sun Sep 18 12:46:29 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Sun Sep 18 12:46:29 2011 +0200

    Fix typos in FeatureSummary.cmake (#12462)
    
    Patch by Yury Kudrashov
    
    Alex

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

-----------------------------------------------------------------------

Summary of changes:
 Modules/FeatureSummary.cmake      |   12 ++++++------
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake