ENH: FindBoost always sets Boost_LIBRARY_DIRS when it finds the Boost libraries
This commit is contained in:
parent
d278ba74b5
commit
629620f9d4
|
@ -147,6 +147,7 @@ MACRO (_Boost_ADJUST_LIB_VARS basename)
|
||||||
IF (Boost_${basename}_LIBRARY)
|
IF (Boost_${basename}_LIBRARY)
|
||||||
SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
|
SET(Boost_${basename}_LIBRARY ${Boost_${basename}_LIBRARY} CACHE FILEPATH "The Boost ${basename} library")
|
||||||
GET_FILENAME_COMPONENT(Boost_LIBRARY_DIRS "${Boost_${basename}_LIBRARY}" PATH)
|
GET_FILENAME_COMPONENT(Boost_LIBRARY_DIRS "${Boost_${basename}_LIBRARY}" PATH)
|
||||||
|
SET(Boost_LIBRARY_DIRS ${Boost_LIBRARY_DIRS} CACHE FILEPATH "Boost library directory")
|
||||||
SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Was the boost boost ${basename} library found")
|
SET(Boost_${basename}_FOUND ON CACHE INTERNAL "Was the boost boost ${basename} library found")
|
||||||
ENDIF (Boost_${basename}_LIBRARY)
|
ENDIF (Boost_${basename}_LIBRARY)
|
||||||
|
|
||||||
|
@ -517,7 +518,7 @@ ELSE (_boost_IN_CACHE)
|
||||||
ENDIF(EXISTS "${_boost_LIB_DIR}/lib")
|
ENDIF(EXISTS "${_boost_LIB_DIR}/lib")
|
||||||
|
|
||||||
IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
|
IF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
|
||||||
SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR})
|
SET(Boost_LIBRARY_DIRS ${_boost_LIB_DIR} CACHE FILEPATH "Boost library directory")
|
||||||
ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
|
ENDIF(_boost_LIB_DIR AND EXISTS "${_boost_LIB_DIR}")
|
||||||
|
|
||||||
ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
|
ENDIF( NOT Boost_LIBRARY_DIRS AND NOT _boost_CHECKED_COMPONENT )
|
||||||
|
|
Loading…
Reference in New Issue