mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-18 13:10:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindBoost: Don't overwrite Boost_${_comp}_FOUND

Browse Source 
Is set in Boost >= 1.71 so don't overwrite it
This commit is contained in:
Alexander Grund
2019-06-11 14:52:32 +02:00
committed by Brad King
parent 4cb652e1d3
commit e4181eeaf2
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/FindBoost.cmake
View File

@@ -276,15 +276,17 @@ if (NOT Boost_NO_BOOST_CMAKE)
# If we found a boost cmake package, then we're done. Print out what we found. # If we found a boost cmake package, then we're done. Print out what we found.
# Otherwise let the rest of the module try to find it. # Otherwise let the rest of the module try to find it.
if(Boost_FOUND) if(Boost_FOUND)
# Neither the legacy boost-cmake nor the new builtin BoostConfig (as in 1.70) # Convert component found variables to standard variables if required
# report the found components in the standard variables, so we need to convert # Necessary for legacy boost-cmake and 1.70 builtin BoostConfig
# them here
if(Boost_FIND_COMPONENTS) if(Boost_FIND_COMPONENTS)
foreach(_comp IN LISTS Boost_FIND_COMPONENTS) foreach(_comp IN LISTS Boost_FIND_COMPONENTS)
if(DEFINED Boost_${_comp}_FOUND)
continue()
endif()
string(TOUPPER ${_comp} _uppercomp) string(TOUPPER ${_comp} _uppercomp)
if(DEFINED Boost${_comp}_FOUND) if(DEFINED Boost${_comp}_FOUND) # legacy boost-cmake project
set(Boost_${_comp}_FOUND ${Boost${_comp}_FOUND}) set(Boost_${_comp}_FOUND ${Boost${_comp}_FOUND})
elseif(DEFINED Boost_${_uppercomp}_FOUND) elseif(DEFINED Boost_${_uppercomp}_FOUND) # Boost 1.70
set(Boost_${_comp}_FOUND ${Boost_${_uppercomp}_FOUND}) set(Boost_${_comp}_FOUND ${Boost_${_uppercomp}_FOUND})
endif() endif()
endforeach() endforeach()