mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-29 02:14:51 +00:00
Code Issues Releases Wiki Activity

Fixing broken compilation when using gnuradio 3.7.3 (using I/Q swap

Browse Source 
option of interleaved_short_to_complex that was introduced in 3.7.4)
This commit is contained in:
Carles Fernandez 2015-07-17 20:25:56 +02:00
parent 0fbe24d39d
commit ea6a92a1fc
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/algorithms/signal_source/adapters/CMakeLists.txt
View File

@ -136,10 +136,12 @@ set(SIGNAL_SOURCE_ADAPTER_SOURCES file_signal_source.cc
nsr_file_signal_source.cc nsr_file_signal_source.cc
spir_file_signal_source.cc spir_file_signal_source.cc
rtl_tcp_signal_source.cc rtl_tcp_signal_source.cc
two_bit_cpx_file_signal_source.cc
${OPT_DRIVER_SOURCES} ${OPT_DRIVER_SOURCES}
) )
if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.4)
set(SIGNAL_SOURCE_ADAPTER_SOURCES ${SIGNAL_SOURCE_ADAPTER_SOURCES} two_bit_cpx_file_signal_source.cc )
endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.4)
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}

6
src/core/receiver/CMakeLists.txt
View File

@ -25,6 +25,12 @@ set(GNSS_RECEIVER_SOURCES
in_memory_configuration.cc in_memory_configuration.cc
) )
if(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.4)
add_definitions(-DMODERN_GNURADIO=1)
endif(PC_GNURADIO_RUNTIME_VERSION VERSION_GREATER 3.7.4)
include_directories( include_directories(
$(CMAKE_CURRENT_SOURCE_DIR) $(CMAKE_CURRENT_SOURCE_DIR)
${CMAKE_SOURCE_DIR}/src/core/system_parameters ${CMAKE_SOURCE_DIR}/src/core/system_parameters

2
src/core/receiver/gnss_block_factory.cc
View File

@ -1045,6 +1045,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
exit(1); exit(1);
} }
} }
#if MODERN_GNURADIO
else if (implementation.compare("Two_Bit_Cpx_File_Signal_Source") == 0) else if (implementation.compare("Two_Bit_Cpx_File_Signal_Source") == 0)
{ {
try try
@ -1060,6 +1061,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
exit(1); exit(1);
} }
} }
#endif
else if (implementation.compare("Spir_File_Signal_Source") == 0) else if (implementation.compare("Spir_File_Signal_Source") == 0)
{ {
try try