mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2026-10-04 06:41:49 +00:00
Code Issues Releases Wiki Activity

Fixing detection of GNU Radio when installed in non-usual locations (e.g. /home/user/target). Now the user can tell cmake where GNU Radio is by 'cmake ../ -DGNURADIO_INSTALL_PREFIX=/home/user/target'

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@462 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Carles Fernandez
2013-12-14 10:23:33 +00:00
parent 61ff27165d
commit 004495507d
15 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/algorithms/acquisition/adapters/CMakeLists.txt
+1
View File
@@ -53,6 +53,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
)
add_library(acq_adapters ${ACQ_ADAPTER_SOURCES})
src/algorithms/channel/adapters/CMakeLists.txt
+1 -1
View File
@@ -30,4 +30,4 @@ include_directories(
)
add_library(channel_adapters ${CHANNEL_ADAPTER_SOURCES})
target_link_libraries(channel_adapters channel_fsm ${GNURADIO_RUNTIME_LIBRARIES})
target_link_libraries(channel_adapters channel_fsm ${GNURADIO_RUNTIME_LIBRARIES} ${Boost_LIBRARIES})
src/algorithms/channel/libs/CMakeLists.txt
+1
View File
@@ -27,6 +27,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
)
add_library(channel_fsm ${CHANNEL_FSM_SOURCES})
src/algorithms/libs/CMakeLists.txt
+1
View File
@@ -47,6 +47,7 @@ include_directories(
${Boost_INCLUDE_DIRS}
${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
)
if(OPENCL_FOUND)
src/algorithms/signal_source/adapters/CMakeLists.txt
+16 -2
View File
@@ -74,7 +74,12 @@ if(RTLSDR_DRIVER)
set(OPT_DRIVER_INCLUDE_DIRS ${OPT_DRIVER_INCLUDE_DIRS} ${RTL_DRIVER_INCLUDE_DIRS})
endif(RTLSDR_DRIVER)
set(SIGNAL_SOURCE_ADAPTER_SOURCES file_signal_source.cc gen_signal_source.cc uhd_signal_source.cc nsr_file_signal_source.cc ${OPT_DRIVER_SOURCES})
set(SIGNAL_SOURCE_ADAPTER_SOURCES file_signal_source.cc
gen_signal_source.cc
uhd_signal_source.cc
nsr_file_signal_source.cc
${OPT_DRIVER_SOURCES}
)
include_directories(
@@ -95,4 +100,13 @@ if(ARCH_64BITS)
endif(ARCH_64BITS)
add_library(signal_source_adapters ${SIGNAL_SOURCE_ADAPTER_SOURCES})
target_link_libraries(signal_source_adapters signal_source_gr_blocks ${Boost_LIBRARIES} ${GNURADIO_PMT_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES} ${OPT_LIBRARIES} gnss_sp_libs)
target_link_libraries(signal_source_adapters signal_source_gr_blocks
${Boost_LIBRARIES}
${GNURADIO_PMT_LIBRARIES}
${GNURADIO_BLOCKS_LIBRARIES}
${UHD_LIBRARIES}
${GNURADIO_UHD_LIBRARIES}
${OPT_LIBRARIES}
gnss_sp_libs
)
src/algorithms/telemetry_decoder/gnuradio_blocks/CMakeLists.txt
+1
View File
@@ -30,6 +30,7 @@ include_directories(
${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
)
add_library(telemetry_decoder_gr_blocks ${TELEMETRY_DECODER_GR_BLOCKS_SOURCES})
src/algorithms/tracking/adapters/CMakeLists.txt
+1 -10
View File
@@ -16,15 +16,7 @@
# along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
#
#if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
#set(TRACKING_ADAPTER_SOURCES
# galileo_e1_dll_pll_veml_tracking.cc
# galileo_e1_tcp_connector_tracking.cc
# gps_l1_ca_dll_fll_pll_tracking.cc
# gps_l1_ca_dll_pll_tracking.cc
# gps_l1_ca_tcp_connector_tracking.cc
#)
#else(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(TRACKING_ADAPTER_SOURCES
galileo_e1_dll_pll_veml_tracking.cc
galileo_e1_tcp_connector_tracking.cc
@@ -33,7 +25,6 @@ set(TRACKING_ADAPTER_SOURCES
gps_l1_ca_dll_pll_tracking.cc
gps_l1_ca_tcp_connector_tracking.cc
)
#endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
include_directories(
$(CMAKE_CURRENT_SOURCE_DIR)
src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+1 -10
View File
@@ -16,15 +16,6 @@
# along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
#
#if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
#set(TRACKING_GR_BLOCKS_SOURCES
# galileo_e1_dll_pll_veml_tracking_cc.cc
# galileo_e1_tcp_connector_tracking_cc.cc
# gps_l1_ca_dll_fll_pll_tracking_cc.cc
# gps_l1_ca_dll_pll_tracking_cc.cc
# gps_l1_ca_tcp_connector_tracking_cc.cc
#)
#else(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(TRACKING_GR_BLOCKS_SOURCES
galileo_e1_dll_pll_veml_tracking_cc.cc
galileo_e1_tcp_connector_tracking_cc.cc
@@ -33,7 +24,6 @@ set(TRACKING_GR_BLOCKS_SOURCES
gps_l1_ca_dll_pll_tracking_cc.cc
gps_l1_ca_tcp_connector_tracking_cc.cc
)
#endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
include_directories(
$(CMAKE_CURRENT_SOURCE_DIR)
@@ -45,6 +35,7 @@ include_directories(
${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
)
add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES})