diff options
| author | Alex Turbov <i.zaufi@gmail.com> | 2017-04-19 09:22:32 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-04-19 15:24:41 (GMT) |
| commit | 2516bccdf69b49ee55ef4b6bfa329d97ec5f3799 (patch) | |
| tree | be065d41c0df06ec0734cf4f17a550ec7e79e0aa /Modules | |
| parent | a6a0cfb24d637063bdb1c8e9e8ceb78cac3f90ac (diff) | |
| download | CMake-2516bccdf69b49ee55ef4b6bfa329d97ec5f3799.zip CMake-2516bccdf69b49ee55ef4b6bfa329d97ec5f3799.tar.gz CMake-2516bccdf69b49ee55ef4b6bfa329d97ec5f3799.tar.bz2 | |
FindBoost: Restore tolerance of backslashes in paths
Since commit v3.8.0-rc1~136^2 (FindBoost: Search official location of
prebuilt binaries on Windows, 2016-12-21) we pass input paths through
`_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` in more
places than before. This broke tolerance of backslashes in paths
provided by the user due to the macro argument re-parsing. Turn
`_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` into a
function instead of macro to avoid re-parsing of macro arguments.
Fixes: #16816
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBoost.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 2dd08e1..52de6fc 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -893,7 +893,7 @@ endfunction() # This function would append corresponding directories if MSVC is a current compiler, # so having `BOOST_ROOT` would be enough to specify to find everything. # -macro(_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir) +function(_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlibvar basedir) if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC") if(CMAKE_SIZEOF_VOID_P EQUAL 8) set(_arch_suffix 64) @@ -915,8 +915,9 @@ macro(_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS componentlib elseif(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 14) list(APPEND ${componentlibvar} ${basedir}/lib${_arch_suffix}-msvc-8.0) endif() + set(${componentlibvar} ${${componentlibvar}} PARENT_SCOPE) endif() -endmacro() +endfunction() # # End functions/macros |