Merge pull request #125 from robertodr/master
Use message from the FindBoost.cmake module
This commit is contained in:
commit
99f6535264
@ -82,7 +82,7 @@ if(FORCE_CUSTOM_BOOST)
|
||||
set(BOOST_INCLUDEDIR "")
|
||||
set(BOOST_LIBRARYDIR "")
|
||||
else(FORCE_CUSTOM_BOOST)
|
||||
find_package(Boost QUIET ${BOOST_MINIMUM_REQUIRED} COMPONENTS "${BOOST_COMPONENTS_REQUIRED}")
|
||||
find_package(Boost ${BOOST_MINIMUM_REQUIRED} COMPONENTS "${BOOST_COMPONENTS_REQUIRED}")
|
||||
if(NOT Boost_FOUND)
|
||||
set(BUILD_CUSTOM_BOOST TRUE)
|
||||
endif(NOT Boost_FOUND)
|
||||
@ -119,7 +119,6 @@ if(BUILD_CUSTOM_BOOST)
|
||||
string(REPLACE "unit_test_framework" "test" b2_needed_components "${b2_needed_components}")
|
||||
set(select_libraries "--with-libraries=${b2_needed_components}")
|
||||
string(REPLACE ";" ", " printout "${BOOST_COMPONENTS_REQUIRED}")
|
||||
message(STATUS "Could NOT find Boost ${BOOST_MINIMUM_REQUIRED}")
|
||||
message(STATUS " Libraries to be built: ${printout}")
|
||||
message(STATUS " Toolset to be used: ${toolset}")
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/boost_configure.cmake)
|
||||
@ -128,7 +127,6 @@ if(BUILD_CUSTOM_BOOST)
|
||||
else(BOOST_COMPONENTS_REQUIRED)
|
||||
# Empty list. Header-only libraries needed
|
||||
# Just unpack to known location
|
||||
message(STATUS "Could NOT find Boost ${BOOST_MINIMUM_REQUIRED}")
|
||||
message(STATUS " No libraries required, installing headers")
|
||||
include(${CMAKE_CURRENT_LIST_DIR}/boost_headers.cmake)
|
||||
endif(BOOST_COMPONENTS_REQUIRED)
|
||||
|
Loading…
x
Reference in New Issue
Block a user