diff options
| author | Brad King <brad.king@kitware.com> | 2013-05-31 13:37:46 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-05-31 13:37:46 (GMT) |
| commit | 498633bc109e061c1179c00448231a7a0953b5a7 (patch) | |
| tree | a87c83f6ff0d19a15c94c750ecd8d0894453a19d | |
| parent | 293f53882ee103645dad14ecd2dfa47a6e448395 (diff) | |
| parent | 363825cd55595b7de62fcf610836f6156a9f1a31 (diff) | |
| download | CMake-498633bc109e061c1179c00448231a7a0953b5a7.zip CMake-498633bc109e061c1179c00448231a7a0953b5a7.tar.gz CMake-498633bc109e061c1179c00448231a7a0953b5a7.tar.bz2 | |
Merge branch 'FindBoost-normalize-slashes' into release
| -rw-r--r-- | Modules/FindBoost.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
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}" ) |