[Cmake-commits] CMake branch, next, updated. v2.8.5-1807-g7dd8302

[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  7dd8302a4030968a627a23b246bb7abfa56e8a82 (commit)
       via  cd81da30f7477b5653665608f4de5f4a4a0e1a14 (commit)
      from  6ac0d0682748999d5dab9f410686518eff5ea21b (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=7dd8302a4030968a627a23b246bb7abfa56e8a82
commit 7dd8302a4030968a627a23b246bb7abfa56e8a82
Merge: 6ac0d06 cd81da3
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Sep 2 14:40:48 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 2 14:40:48 2011 -0400

    Merge topic 'fix-message-details' into next
    
    cd81da3 FindPackageMessage: Eliminate new lines using REGEX REPLACE


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cd81da30f7477b5653665608f4de5f4a4a0e1a14
commit cd81da30f7477b5653665608f4de5f4a4a0e1a14
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Sep 2 14:37:39 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Sep 2 14:37:49 2011 -0400

    FindPackageMessage: Eliminate new lines using REGEX REPLACE
    
    Re-fix problem exposed by recent commit to FindPythonInterp.
    If the find "details" has new lines in it, then replace them
    with the empty string so that the string may be saved as a
    cache entry that can be re-read next time CMake runs.
    
    Use REGEX REPLACE, and replace with an empty string, eliminating
    the problem characters, so that we may easily extend this to
    include additional problem characters in the future if necessary.

diff --git a/Modules/FindPackageMessage.cmake b/Modules/FindPackageMessage.cmake
index 5afee3e..48d3472 100644
--- a/Modules/FindPackageMessage.cmake
+++ b/Modules/FindPackageMessage.cmake
@@ -34,7 +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}")
+    STRING(REGEX REPLACE "[\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 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake