AnotherFoxGuy/autocmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #125 from robertodr/master

Browse Source 
Use message from the FindBoost.cmake module
This commit is contained in:
Radovan Bast 2015-09-09 09:52:34 +02:00
commit 99f6535264
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/boost/boost.cmake
View File

@ -82,7 +82,7 @@ if(FORCE_CUSTOM_BOOST)
set(BOOST_INCLUDEDIR "") set(BOOST_INCLUDEDIR "")
set(BOOST_LIBRARYDIR "") set(BOOST_LIBRARYDIR "")
else(FORCE_CUSTOM_BOOST) 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) if(NOT Boost_FOUND)
set(BUILD_CUSTOM_BOOST TRUE) set(BUILD_CUSTOM_BOOST TRUE)
endif(NOT Boost_FOUND) endif(NOT Boost_FOUND)
@ -119,7 +119,6 @@ if(BUILD_CUSTOM_BOOST)
string(REPLACE "unit_test_framework" "test" b2_needed_components "${b2_needed_components}") string(REPLACE "unit_test_framework" "test" b2_needed_components "${b2_needed_components}")
set(select_libraries "--with-libraries=${b2_needed_components}") set(select_libraries "--with-libraries=${b2_needed_components}")
string(REPLACE ";" ", " printout "${BOOST_COMPONENTS_REQUIRED}") string(REPLACE ";" ", " printout "${BOOST_COMPONENTS_REQUIRED}")
message(STATUS "Could NOT find Boost ${BOOST_MINIMUM_REQUIRED}")
message(STATUS " Libraries to be built: ${printout}") message(STATUS " Libraries to be built: ${printout}")
message(STATUS " Toolset to be used: ${toolset}") message(STATUS " Toolset to be used: ${toolset}")
include(${CMAKE_CURRENT_LIST_DIR}/boost_configure.cmake) include(${CMAKE_CURRENT_LIST_DIR}/boost_configure.cmake)
@ -128,7 +127,6 @@ if(BUILD_CUSTOM_BOOST)
else(BOOST_COMPONENTS_REQUIRED) else(BOOST_COMPONENTS_REQUIRED)
# Empty list. Header-only libraries needed # Empty list. Header-only libraries needed
# Just unpack to known location # Just unpack to known location
message(STATUS "Could NOT find Boost ${BOOST_MINIMUM_REQUIRED}")
message(STATUS " No libraries required, installing headers") message(STATUS " No libraries required, installing headers")
include(${CMAKE_CURRENT_LIST_DIR}/boost_headers.cmake) include(${CMAKE_CURRENT_LIST_DIR}/boost_headers.cmake)
endif(BOOST_COMPONENTS_REQUIRED) endif(BOOST_COMPONENTS_REQUIRED)