[Cmake-commits] CMake branch, next, updated. v2.8.11-2367-g7c4018e

[Brad King]

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  7c4018ef8c52e89fc95062d9c0c09053a59949df (commit)
       via  363825cd55595b7de62fcf610836f6156a9f1a31 (commit)
      from  700224e26b4ff22656368d539b90eaa0f4be4063 (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=7c4018ef8c52e89fc95062d9c0c09053a59949df
commit 7c4018ef8c52e89fc95062d9c0c09053a59949df
Merge: 700224e 363825c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 30 16:29:12 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 30 16:29:12 2013 -0400

    Merge topic 'FindBoost-normalize-slashes' into next
    
    363825c FindBoost: Fix handling of \ in input paths (#14179)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=363825cd55595b7de62fcf610836f6156a9f1a31
commit 363825cd55595b7de62fcf610836f6156a9f1a31
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu May 30 16:11:11 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu May 30 16:20:55 2013 -0400

    FindBoost: Fix handling of \ in input paths (#14179)
    
    In commit 5b9149e0 (FindBoost: Overhaul caching and search repeat
    behavior, 2012-09-24) we refactored the internal library search to use a
    _Boost_FIND_LIBRARY macro to wrap around find_library calls.  However,
    CMake macros re-process escape sequences when evaluating calls inside
    the macro after substituting placeholders (a historical bug).  In order
    to avoid escape sequences, convert backslashes to forward slashes before
    passing arguments to the _Boost_FIND_LIBRARY macro.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 8d8b10c..0a9ffc1 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -928,9 +928,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
                    "Searching for ${UPPERCOMPONENT}_LIBRARY_RELEASE: ${_boost_RELEASE_NAMES}")
   endif()
+
+  # Avoid passing backslashes to _Boost_FIND_LIBRARY due to macro re-parsing.
+  string(REPLACE "\\" "/" _boost_LIBRARY_SEARCH_DIRS_tmp "${_boost_LIBRARY_SEARCH_DIRS}")
+
   _Boost_FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_RELEASE
     NAMES ${_boost_RELEASE_NAMES}
-    HINTS ${_boost_LIBRARY_SEARCH_DIRS}
+    HINTS ${_boost_LIBRARY_SEARCH_DIRS_tmp}
     NAMES_PER_DIR
     DOC "${_boost_docstring_release}"
     )
@@ -960,9 +964,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
     message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
                    "Searching for ${UPPERCOMPONENT}_LIBRARY_DEBUG: ${_boost_DEBUG_NAMES}")
   endif()
+
+  # Avoid passing backslashes to _Boost_FIND_LIBRARY due to macro re-parsing.
+  string(REPLACE "\\" "/" _boost_LIBRARY_SEARCH_DIRS_tmp "${_boost_LIBRARY_SEARCH_DIRS}")
+
   _Boost_FIND_LIBRARY(Boost_${UPPERCOMPONENT}_LIBRARY_DEBUG
     NAMES ${_boost_DEBUG_NAMES}
-    HINTS ${_boost_LIBRARY_SEARCH_DIRS}
+    HINTS ${_boost_LIBRARY_SEARCH_DIRS_tmp}
     NAMES_PER_DIR
     DOC "${_boost_docstring_debug}"
     )

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

Summary of changes:
 Modules/FindBoost.cmake |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake