summaryrefslogtreecommitdiffstats
path: root/Modules/FindBoost.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-04-20 12:47:02 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-04-20 12:47:05 (GMT)
commit6c7460bc48be10a774f54271340711bcfdef8fb5 (patch)
treecc062b4785e590136a5a2a7249835fca78a8867b /Modules/FindBoost.cmake
parent01d72391b3974b63a348b59a0ad2c528f4e68bb4 (diff)
parent2516bccdf69b49ee55ef4b6bfa329d97ec5f3799 (diff)
downloadCMake-6c7460bc48be10a774f54271340711bcfdef8fb5.zip
CMake-6c7460bc48be10a774f54271340711bcfdef8fb5.tar.gz
CMake-6c7460bc48be10a774f54271340711bcfdef8fb5.tar.bz2
Merge topic 'FindBoost-fix-backslash-tolerance'
2516bccd FindBoost: Restore tolerance of backslashes in paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !721
Diffstat (limited to 'Modules/FindBoost.cmake')
-rw-r--r--Modules/FindBoost.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index c3cf341..093d8c9 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -896,7 +896,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)
@@ -919,8 +919,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