mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-23 11:37:40 +00:00
Code Issues Releases Wiki Activity

Improving the way cmake detects GNU Radio. Switching from FindGnuradioXXX() to ConfigGnuradio.cmake. Fixed a typo in README. Tested in Mac OS X 10.9 and Ubuntu 13.10 64 bits, should work on other versions as well.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@442 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Carles Fernandez
2013-11-13 21:07:33 +00:00
parent 21418835b3
commit 669910f6af
14 changed files with 250 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/CMakeLists.txt
View File

@@ -35,7 +35,6 @@ add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
if(OS_IS_MACOSX)
if (MACOSX_MAVERICKS)
link_directories( /opt/local/lib /usr/local/lib) # Not very elegant, to be fixed
set(MAC_LIBRARIES "-stdlib=libc++ -std=c++11 -framework Accelerate")
else(MACOSX_MAVERICKS)
link_directories( /opt/local/lib ) # Not very elegant, to be fixed
@@ -44,7 +43,19 @@ if(OS_IS_MACOSX)
endif(OS_IS_MACOSX)
add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
target_link_libraries(gnss-sdr ${MAC_LIBRARIES} ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES} ${ARMADILLO_LIBRARIES} gnss_sp_libs gnss_rx)
target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
${Boost_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}
${GNURADIO_FFT_LIBRARIES}
${GNURADIO_FILTER_LIBRARIES}
${GFlags_LIBS}
${GLOG_LIBRARIES}
${ARMADILLO_LIBRARIES}
gnss_sp_libs
gnss_rx
)
install(TARGETS gnss-sdr

47
src/tests/CMakeLists.txt
View File

@@ -75,8 +75,6 @@ else(NOT GTEST_DIR_LOCAL)
set(GTEST_LIBRARIES gtest)
endif(NOT GTEST_DIR_LOCAL)
#find_library(GnuradioAnalog)
include_directories(
${GTEST_INCLUDE_DIRECTORIES}
@@ -107,26 +105,30 @@ include_directories(
${Boost_INCLUDE_DIRS}
)
find_library(
GNURADIO_ANALOG_LIBRARIES
NAMES gnuradio-analog
PATHS /usr/local/lib
/usr/local/lib64
/usr/lib
/usr/lib64
)
if(OS_IS_MACOSX)
if(MACOSX_MAVERICKS)
# Tell the linker where the libraries installed by MacPorts are
link_directories(/opt/local/lib /usr/local/lib ) # not very elegant, to be fixed
set(MAC_LIBRARIES "-stdlib=libc++ -std=c++11 -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-blocks -lgnuradio-fft -lgnuradio-filter -lgnuradio-uhd")
set(MAC_LIBRARIES "-stdlib=libc++ -std=c++11")
else(MACOSX_MAVERICKS)
link_directories( /opt/local/lib ) # not very elegant, to be fixed
endif(MACOSX_MAVERICKS)
endif(OS_IS_MACOSX)
add_executable(run_tests ${CMAKE_CURRENT_SOURCE_DIR}/test_main.cc)
target_link_libraries(run_tests ${MAC_LIBRARIES} ${Boost_LIBRARIES} ${GFLAGS_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES} ${GNURADIO_ANALOG_LIBRARIES} gnss_sp_libs gnss_rx signal_generator_blocks)
target_link_libraries(run_tests ${MAC_LIBRARIES}
${Boost_LIBRARIES}
${GFLAGS_LIBS}
${GLOG_LIBRARIES}
${GTEST_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}
${GNURADIO_FILTER_LIBRARIES}
${GNURADIO_ANALOG_LIBRARIES}
gnss_sp_libs
gnss_rx
signal_generator_blocks
)
install(TARGETS run_tests DESTINATION ${CMAKE_SOURCE_DIR}/install)
@@ -142,7 +144,14 @@ add_executable(control_thread_test EXCLUDE_FROM_ALL
${CMAKE_CURRENT_SOURCE_DIR}/single_test_main.cc
${CMAKE_CURRENT_SOURCE_DIR}/control_thread/control_message_factory_test.cc
)
target_link_libraries(control_thread_test ${Boost_LIBRARIES} ${GFLAGS_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES} gnss_sp_libs gnss_rx)
target_link_libraries(control_thread_test ${Boost_LIBRARIES}
${GFLAGS_LIBS}
${GLOG_LIBRARIES}
${GTEST_LIBRARIES}
gnss_sp_libs
gnss_rx
)
add_test(control_thread_test control_thread_test)
add_executable(gnss_block_test EXCLUDE_FROM_ALL
@@ -164,7 +173,15 @@ add_executable(gnss_block_test EXCLUDE_FROM_ALL
${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/file_output_filter_test.cc
${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/gnss_block_factory_test.cc
)
target_link_libraries(gnss_block_test ${Boost_LIBRARIES} ${GFLAGS_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES} gnss_sp_libs gnss_rx signal_generator_blocks)
target_link_libraries(gnss_block_test ${Boost_LIBRARIES}
${GFLAGS_LIBS}
${GLOG_LIBRARIES}
${GTEST_LIBRARIES}
gnss_sp_libs
gnss_rx
signal_generator_blocks
)
add_test(gnss_block_test gnss_block_test)

34
src/utils/front-end-cal/CMakeLists.txt
View File

@@ -20,10 +20,9 @@
if($ENV{RTLSDR_DRIVER})
set(RTLSDR_DRIVER ON)
endif($ENV{RTLSDR_DRIVER})
if(RTLSDR_DRIVER)
set(FRONT_END_CAL_SOURCES
front_end_cal.cc
)
set(FRONT_END_CAL_SOURCES front_end_cal.cc)
include_directories(
${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -44,20 +43,35 @@ if(RTLSDR_DRIVER)
${Boost_INCLUDE_DIRS}
)
if(OS_IS_MACOSX)
# Tell the linker where the libraries installed by MacPorts are
link_directories( /opt/local/lib ) # ugly!
endif(OS_IS_MACOSX)
add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES})
target_link_libraries(front_end_cal_lib ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES} ${ARMADILLO_LIBRARIES} gnss_rx gnss_sp_libs)
target_link_libraries(front_end_cal_lib ${Boost_LIBRARIES}
${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}
${GFlags_LIBS}
${GLOG_LIBRARIES}
${ARMADILLO_LIBRARIES}
gnss_rx
gnss_sp_libs
)
add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
add_executable(front-end-cal ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
target_link_libraries(front-end-cal ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${Boost_LIBRARIES} ${GFlags_LIBS} ${GLOG_LIBRARIES} ${ARMADILLO_LIBRARIES} gnss_rx gnss_sp_libs front_end_cal_lib)
target_link_libraries(front-end-cal ${GNURADIO_RUNTIME_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}
${Boost_LIBRARIES}
${GFlags_LIBS}
${GLOG_LIBRARIES}
${ARMADILLO_LIBRARIES}
gnss_rx
gnss_sp_libs
front_end_cal_lib
)
install(TARGETS front-end-cal
DESTINATION ${CMAKE_SOURCE_DIR}/install
)
endif(RTLSDR_DRIVER)