diff options
| author | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-04-14 15:06:35 +0200 |
|---|---|---|
| committer | Dimitri Stolnikov <horiz0n@gmx.net> | 2013-04-14 15:06:35 +0200 |
| commit | b999924d8e496152299cde1e10ed5fe31c61f686 (patch) | |
| tree | 9d727f3a9db27327faf67a43e104e13809b24f99 /CMakeLists.txt | |
| parent | 44ff52590475f7d340600c26b280af188bce74c1 (diff) | |
cmake: remove boost thread & system dependencies
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index bce201f..9e50023 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,11 +63,6 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX) ######################################################################## MESSAGE(STATUS "Configuring Boost C++ Libraries...") -SET(BOOST_REQUIRED_COMPONENTS - thread - system -) - if(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") list(APPEND BOOST_LIBRARYDIR "/usr/lib64") #fedora 64-bit fix endif(UNIX AND NOT BOOST_ROOT AND EXISTS "/usr/lib64") @@ -81,12 +76,15 @@ set(Boost_ADDITIONAL_VERSIONS "1.60.0" "1.60" "1.61.0" "1.61" "1.62.0" "1.62" "1.63.0" "1.63" "1.64.0" "1.64" "1.65.0" "1.65" "1.66.0" "1.66" "1.67.0" "1.67" "1.68.0" "1.68" "1.69.0" "1.69" ) -find_package(Boost 1.35 COMPONENTS ${BOOST_REQUIRED_COMPONENTS}) + +find_package(Boost) if(NOT Boost_FOUND) - message(FATAL_ERROR "Boost required to compile osmosdr") + message(FATAL_ERROR "Boost required to build " ${CMAKE_PROJECT_NAME}) endif() +ADD_DEFINITIONS(-DBOOST_ALL_DYN_LINK) + ######################################################################## # Install directories ######################################################################## @@ -119,11 +117,11 @@ find_package(LibMiriSDR) find_package(LibHackRF) if(NOT GRUEL_FOUND) - message(FATAL_ERROR "Gruel required to compile gnuradio-osmosdr") + message(FATAL_ERROR "Gruel required to build " ${CMAKE_PROJECT_NAME}) endif() if(NOT GNURADIO_CORE_FOUND) - message(FATAL_ERROR "GnuRadio Core required to compile gnuradio-osmosdr") + message(FATAL_ERROR "GnuRadio Core required to build " ${CMAKE_PROJECT_NAME}) endif() ######################################################################## |