From 1ad1f0569c82ab849c16cc745868d57b5b01eb62 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 20 Jul 2013 07:52:56 +0000 Subject: [PATCH] fixed a problem in including GNU Radio 3.7 from cmake script git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@391 64b25241-fba3-4117-9849-534c7e92360d --- src/utils/front-end-cal/CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt index 25029814e..a9aba2fdb 100644 --- a/src/utils/front-end-cal/CMakeLists.txt +++ b/src/utils/front-end-cal/CMakeLists.txt @@ -33,19 +33,24 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/algorithms/acquisition/gnuradio_blocks ${GLOG_INCLUDE_DIRS} ${GFlags_INCLUDE_DIRS} - ${GNURADIO_CORE_INCLUDE_DIRS} - ${GNURADIO_GRUEL_INCLUDE_DIRS} + ${GNURADIO_RUNTIME_INCLUDE_DIRS} + ${GNURADIO_BLOCKS_INCLUDE_DIRS} ${ARMADILLO_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) +if(OS_IS_MACOSX) + # Tell the linker where the libraries installed by MacPorts are + link_directories( /opt/local/lib ) +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} ${GNURADIO_FFT_LIBRARIES} ${GNURADIO_FILTER_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 ${Boost_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FFT_LIBRARIES} ${GNURADIO_FILTER_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