diff options
| author | Tim O'Shea <tim.oshea753@gmail.com> | 2012-12-07 09:28:41 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2012-12-07 09:36:19 -0800 |
| commit | 52ca5e2765b7a4532d26502b5b76b7c85c5019d7 (patch) | |
| tree | 27901f998f00d4c824c060723fab9d397931aeb3 /volk | |
| parent | 69990c3fb6d4c7a0daee0229407241aa1959095a (diff) | |
core: added gr_tuntap_pdu, gr_socket_pdu, and msg passing enhancements
Diffstat (limited to 'volk')
| -rw-r--r-- | volk/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | volk/apps/CMakeLists.txt | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/volk/CMakeLists.txt b/volk/CMakeLists.txt index 68385f9740..9519505eb9 100644 --- a/volk/CMakeLists.txt +++ b/volk/CMakeLists.txt @@ -38,12 +38,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) #location for custom "M # Environment setup ######################################################################## IF(NOT DEFINED BOOST_ROOT) - SET(BOOST_ROOT "") + SET(BOOST_ROOT ${CMAKE_INSTALL_PREFIX}) ENDIF() -SET(BOOST_ROOT ${BOOST_ROOT} CACHE STRING "Modify search path for Boost components") - -#after caching user-defined value, make sure to add the install prefix -SET(BOOST_ROOT ${BOOST_ROOT}:${CMAKE_INSTALL_PREFIX}) IF(NOT DEFINED CROSSCOMPILE_MULTILIB) SET(CROSSCOMPILE_MULTILIB "") @@ -77,6 +73,10 @@ set(Boost_ADDITIONAL_VERSIONS ) find_package(Boost COMPONENTS unit_test_framework) +if(NOT Boost_FOUND) + message(FATAL_ERROR "VOLK Requires boost to build") +endif() + find_package(ORC) ######################################################################## diff --git a/volk/apps/CMakeLists.txt b/volk/apps/CMakeLists.txt index 175105a5a3..a89a9409d8 100644 --- a/volk/apps/CMakeLists.txt +++ b/volk/apps/CMakeLists.txt @@ -18,7 +18,7 @@ ######################################################################## # Setup profiler ######################################################################## -find_package(Boost) +find_package(Boost COMPONENTS unit_test_framework) if(Boost_FOUND AND UNIX) #uses mkdir and $HOME |