[Cmake-commits] CMake branch, next, updated. v2.8.5-1699-g54ec324

[David Cole]

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  54ec3246c84d6954b175c0e64b325b9d73d99a11 (commit)
       via  0ae78b76d544adad4860b66bdd6279fdde07ea34 (commit)
      from  da375ffe563a89e295b50f01342d4631af6a1470 (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=54ec3246c84d6954b175c0e64b325b9d73d99a11
commit 54ec3246c84d6954b175c0e64b325b9d73d99a11
Merge: da375ff 0ae78b7
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Aug 24 14:11:57 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 24 14:11:57 2011 -0400

    Merge topic 'fix-message-details' into next
    
    0ae78b7 FindPackageMessage: Eliminate new lines in cache entries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ae78b76d544adad4860b66bdd6279fdde07ea34
commit 0ae78b76d544adad4860b66bdd6279fdde07ea34
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Wed Aug 24 14:06:51 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Wed Aug 24 14:06:51 2011 -0400

    FindPackageMessage: Eliminate new lines in cache entries
    
    Fix problem exposed by recent commit to FindPythonInterp.
    If the find "details" has new lines in it, then replace them
    with literal "\n" two character sequences so that the string
    may be saved as a cache entry that can be re-read next time
    CMake runs.

diff --git a/Modules/FindPackageMessage.cmake b/Modules/FindPackageMessage.cmake
index eb398b2..5afee3e 100644
--- a/Modules/FindPackageMessage.cmake
+++ b/Modules/FindPackageMessage.cmake
@@ -34,6 +34,7 @@
 FUNCTION(FIND_PACKAGE_MESSAGE pkg msg details)
   # Avoid printing a message repeatedly for the same find result.
   IF(NOT ${pkg}_FIND_QUIETLY)
+    STRING(REPLACE "\n" "\\n" details "${details}")
     SET(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
     IF(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
       # The message has not yet been printed.

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

Summary of changes:
 Modules/FindPackageMessage.cmake |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake