diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-19 15:28:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-04-19 15:28:08 (GMT) |
| commit | b99fbf3b16449a6027e90ed7f01f240761157332 (patch) | |
| tree | 32907853ef6df0800e850e2e5efc3ce5cd531add /Modules | |
| parent | f612719a77e46cff6c6258e1394547c3476a5a21 (diff) | |
| parent | 2516bccdf69b49ee55ef4b6bfa329d97ec5f3799 (diff) | |
| download | CMake-b99fbf3b16449a6027e90ed7f01f240761157332.zip CMake-b99fbf3b16449a6027e90ed7f01f240761157332.tar.gz CMake-b99fbf3b16449a6027e90ed7f01f240761157332.tar.bz2 | |
Merge branch 'FindBoost-fix-backslash-tolerance' into release
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 |