[hamradio-commits] [gnss-sdr] 202/251: Fixing broken compilation when using gnuradio 3.7.3 (using I/Q swap option of interleaved_short_to_complex that was introduced in 3.7.4)

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit ea6a92a1fcf5282e11e8ffbed406c46196c557ec
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Fri Jul 17 20:25:56 2015 +0200

    Fixing broken compilation when using gnuradio 3.7.3 (using I/Q swap
    option of interleaved_short_to_complex that was introduced in 3.7.4)
---
 src/algorithms/signal_source/adapters/CMakeLists.txt | 4 +++-
 src/core/receiver/CMakeLists.txt                     | 6 ++++++
 src/core/receiver/gnss_block_factory.cc              | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/algorithms/signal_source/adapters/CMakeLists.txt b/src/algorithms/signal_source/adapters/CMakeLists.txt
index e277586..2cba96e 100644
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -136,10 +136,12 @@ set(SIGNAL_SOURCE_ADAPTER_SOURCES file_signal_source.cc
                                   nsr_file_signal_source.cc
                                   spir_file_signal_source.cc
 				  				  rtl_tcp_signal_source.cc
-				  				  two_bit_cpx_file_signal_source.cc
                                   ${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(
      ${CMAKE_CURRENT_SOURCE_DIR}
diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt
index 677efd7..b568648 100644
--- a/src/core/receiver/CMakeLists.txt
+++ b/src/core/receiver/CMakeLists.txt
@@ -25,6 +25,12 @@ set(GNSS_RECEIVER_SOURCES
      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(
      $(CMAKE_CURRENT_SOURCE_DIR)
      ${CMAKE_SOURCE_DIR}/src/core/system_parameters
diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 770c1a6..95485a4 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -1045,6 +1045,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                     exit(1);
             }
         }
+#if MODERN_GNURADIO
     else if (implementation.compare("Two_Bit_Cpx_File_Signal_Source") == 0)
         {
             try
@@ -1060,6 +1061,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                     exit(1);
             }
         }
+#endif
     else if (implementation.compare("Spir_File_Signal_Source") == 0)
         {
             try

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git