kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindBoost-MPI-hints' 

a22eeca3 FindBoost: Search next to MPI libraries for boost_mpi (#14739)
This commit is contained in:
Brad King 2014-02-12 11:31:22 -05:00 committed by CMake Topic Stage
parent 5104f55d3f a22eeca3fd
commit 9b06fa50ae
1 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
Modules/FindBoost.cmake
View File

@ -305,10 +305,15 @@ endmacro()
macro(_Boost_FIND_LIBRARY var) macro(_Boost_FIND_LIBRARY var)
find_library(${var} ${ARGN}) find_library(${var} ${ARGN})
# If we found the first library save Boost_LIBRARY_DIR. if(${var})
if(${var} AND NOT Boost_LIBRARY_DIR) # If this is the first library found then save Boost_LIBRARY_DIR.
get_filename_component(_dir "${${var}}" PATH) if(NOT Boost_LIBRARY_DIR)
set(Boost_LIBRARY_DIR "${_dir}" CACHE PATH "Boost library directory" FORCE) get_filename_component(_dir "${${var}}" PATH)
set(Boost_LIBRARY_DIR "${_dir}" CACHE PATH "Boost library directory" FORCE)
endif()
elseif(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
# Try component-specific hints but do not save Boost_LIBRARY_DIR.
find_library(${var} HINTS ${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT} ${ARGN})
endif() endif()
# If Boost_LIBRARY_DIR is known then search only there. # If Boost_LIBRARY_DIR is known then search only there.
@ -935,6 +940,28 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
set( _boost_docstring_release "Boost ${COMPONENT} library (release)") set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)") set( _boost_docstring_debug "Boost ${COMPONENT} library (debug)")
# Compute component-specific hints.
set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python")
foreach(lib ${MPI_CXX_LIBRARIES} ${MPI_C_LIBRARIES})
if(IS_ABSOLUTE "${lib}")
get_filename_component(libdir "${lib}" PATH)
string(REPLACE "\\" "/" libdir "${libdir}")
list(APPEND _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT ${libdir})
endif()
endforeach()
endif()
# Consolidate and report component-specific hints.
if(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
list(REMOVE_DUPLICATES _Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
if(Boost_DEBUG)
message(STATUS "[ ${CMAKE_CURRENT_LIST_FILE}:${CMAKE_CURRENT_LIST_LINE} ] "
"Component-specific library search paths for ${COMPONENT}: "
"${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT}")
endif()
endif()
# #
# Find RELEASE libraries # Find RELEASE libraries
# #