diff options
| author | Brad King <brad.king@kitware.com> | 2017-09-19 12:13:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-09-19 12:15:36 (GMT) |
| commit | d947310f173a2652c3b069ade212d548075e4d7b (patch) | |
| tree | 3a3bb3a9bc9598c7c2f484be2d1f680eee576767 | |
| parent | 3be6835ed198253c01e2dbc2e4e0542468bb5be4 (diff) | |
| parent | a929dd166e16cd7b3aa4c9352faaf3b01bc61101 (diff) | |
| download | CMake-d947310f173a2652c3b069ade212d548075e4d7b.zip CMake-d947310f173a2652c3b069ade212d548075e4d7b.tar.gz CMake-d947310f173a2652c3b069ade212d548075e4d7b.tar.bz2 | |
Merge topic 'FindBoost-IN_LIST'
a929dd16 FindBoost: Simplify search in lists
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1281
| -rw-r--r-- | Modules/FindBoost.cmake | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index b3d204b..6d1514d 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -214,6 +214,10 @@ # # Set Boost_NO_BOOST_CMAKE to ON to disable the search for boost-cmake. +# Save project's policies +cmake_policy(PUSH) +cmake_policy(SET CMP0057 NEW) # if IN_LIST + #------------------------------------------------------------------------------- # Before we go searching, check whether boost-cmake is available, unless the # user specifically asked NOT to search for boost-cmake. @@ -905,9 +909,7 @@ function(_Boost_MISSING_DEPENDENCIES componentvar extravar) set(_Boost_${uppercomponent}_DEPENDENCIES ${_Boost_${uppercomponent}_DEPENDENCIES} PARENT_SCOPE) set(_Boost_IMPORTED_TARGETS ${_Boost_IMPORTED_TARGETS} PARENT_SCOPE) foreach(componentdep ${_Boost_${uppercomponent}_DEPENDENCIES}) - list(FIND _boost_processed_components "${componentdep}" _boost_component_found) - list(FIND _boost_new_components "${componentdep}" _boost_component_new) - if (_boost_component_found EQUAL -1 AND _boost_component_new EQUAL -1) + if (NOT ("${componentdep}" IN_LIST _boost_processed_components OR "${componentdep}" IN_LIST _boost_new_components)) list(APPEND _boost_new_components ${componentdep}) endif() endforeach() @@ -1541,8 +1543,7 @@ endif() _Boost_MISSING_DEPENDENCIES(Boost_FIND_COMPONENTS _Boost_EXTRA_FIND_COMPONENTS) # If thread is required, get the thread libs as a dependency -list(FIND Boost_FIND_COMPONENTS thread _Boost_THREAD_DEPENDENCY_LIBS) -if(NOT _Boost_THREAD_DEPENDENCY_LIBS EQUAL -1) +if("thread" IN_LIST Boost_FIND_COMPONENTS) if(Boost_FIND_QUIETLY) set(_Boost_find_quiet QUIET) else() @@ -1977,3 +1978,6 @@ list(REMOVE_DUPLICATES _Boost_COMPONENTS_SEARCHED) list(SORT _Boost_COMPONENTS_SEARCHED) set(_Boost_COMPONENTS_SEARCHED "${_Boost_COMPONENTS_SEARCHED}" CACHE INTERNAL "Components requested for this build tree.") + +# Restore project's policies +cmake_policy(POP) |