[Cmake-commits] CMake branch, next, updated. v2.8.2-884-ga04da3e

[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  a04da3ec075377461d567b98dab25993d502b8cf (commit)
       via  07bca488683c3382b76c7ba6f89eeb87961dc9ba (commit)
       via  d5b29155b47935c230b0f949c6fb0e0962173395 (commit)
      from  911c4326bbbe730f417084ebce0030967de686b1 (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=a04da3ec075377461d567b98dab25993d502b8cf
commit a04da3ec075377461d567b98dab25993d502b8cf
Merge: 911c432 07bca48
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Sep 21 22:31:52 2010 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Sep 21 22:31:52 2010 +0200

    Merge branch 'DescriptionsForFeatureSummaryALL' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=07bca488683c3382b76c7ba6f89eeb87961dc9ba
commit 07bca488683c3382b76c7ba6f89eeb87961dc9ba
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Sep 21 22:31:04 2010 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Sep 21 22:31:04 2010 +0200

    Set a default DESCRIPTION if none is given for ALL mode of feature_summary()
    
    Alex

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 78788f4..c761e7a 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -199,16 +199,20 @@ FUNCTION(FEATURE_SUMMARY)
      OR "${_FS_WHAT}" STREQUAL "PACKAGES_FOUND"
      OR "${_FS_WHAT}" STREQUAL "PACKAGES_NOT_FOUND")
     _FS_GET_FEATURE_SUMMARY( ${_FS_WHAT} _featureSummary)
+    SET(_fullText "${_FS_DESCRIPTION}${_featureSummary}\n")
   ELSEIF("${_FS_WHAT}" STREQUAL "ALL")
     _FS_GET_FEATURE_SUMMARY( PACKAGES_FOUND _tmp1)
     _FS_GET_FEATURE_SUMMARY( PACKAGES_NOT_FOUND _tmp2)
     SET(_featureSummary "${_tmp1}${_tmp2}")
+    IF(_FS_DESCRIPTION)
+      SET(_fullText "${_FS_DESCRIPTION}${_tmp1}${_tmp2}\n")
+    ELSE(_FS_DESCRIPTION)
+      SET(_fullText "-- Found the following packages:${_tmp1}\n-- Did not find the following packages:${_tmp2}\n")
+    ENDIF(_FS_DESCRIPTION)
   ELSE()
     MESSAGE(FATAL_ERROR "The WHAT argument of FEATURE_SUMMARY() is set to ${_FS_WHAT}, which is not a valid value.")
   ENDIF()
 
-  SET(_fullText "${_FS_DESCRIPTION}${_featureSummary}\n")
-
   IF(_FS_FILENAME)
     IF(_FS_APPEND)
       FILE(APPEND "${_FS_FILENAME}" "${_fullText}")

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d5b29155b47935c230b0f949c6fb0e0962173395
commit d5b29155b47935c230b0f949c6fb0e0962173395
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Sep 21 22:27:14 2010 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Sep 21 22:27:14 2010 +0200

    APPEND and not-APPEND mode of feature_summary() were swapped
    
    Alex

diff --git a/Modules/FeatureSummary.cmake b/Modules/FeatureSummary.cmake
index 594e2e7..78788f4 100644
--- a/Modules/FeatureSummary.cmake
+++ b/Modules/FeatureSummary.cmake
@@ -211,9 +211,9 @@ FUNCTION(FEATURE_SUMMARY)
 
   IF(_FS_FILENAME)
     IF(_FS_APPEND)
-      FILE(WRITE  "${_FS_FILENAME}" "${_fullText}")
-    ELSE(_FS_APPEND)
       FILE(APPEND "${_FS_FILENAME}" "${_fullText}")
+    ELSE(_FS_APPEND)
+      FILE(WRITE  "${_FS_FILENAME}" "${_fullText}")
     ENDIF(_FS_APPEND)
 
   ELSE(_FS_FILENAME)

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

Summary of changes:
 Modules/FeatureSummary.cmake |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake