Break dependency by moving files

src/algorithms/libs/CMakeLists.txt

@@ -22,7 +22,6 @@ set(GNSS_SPLIBS_SOURCES
     gps_l2c_signal.cc
     gps_l5_signal.cc
     galileo_e1_signal_processing.cc
-    gnss_sdr_sample_counter.cc
     gnss_signal_processing.cc
     gps_sdr_signal_processing.cc
     glonass_l1_signal_processing.cc
@@ -46,7 +45,6 @@ set(GNSS_SPLIBS_HEADERS
     gps_l2c_signal.h
     gps_l5_signal.h
     galileo_e1_signal_processing.h
-    gnss_sdr_sample_counter.h
     gnss_signal_processing.h
     gps_sdr_signal_processing.h
     glonass_l1_signal_processing.h
@@ -67,29 +65,12 @@ set(GNSS_SPLIBS_HEADERS
     geofunctions.h
 )
 
-if(ENABLE_FPGA)
-    set(GNSS_SPLIBS_SOURCES
-        ${GNSS_SPLIBS_SOURCES}
-        gnss_sdr_time_counter.cc
-        gnss_sdr_fpga_sample_counter.cc
-    )
-    set(GNSS_SPLIBS_HEADERS
-        ${GNSS_SPLIBS_HEADERS}
-        gnss_sdr_time_counter.h
-        gnss_sdr_fpga_sample_counter.h
-    )
-endif()
-
 if(OPENCL_FOUND)
     set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES}
         opencl/fft_execute.cc # Needs OpenCL
         opencl/fft_setup.cc # Needs OpenCL
         opencl/fft_kernelstring.cc # Needs OpenCL
     )
-endif()
-
-
-if(OPENCL_FOUND)
     include_directories(${OPENCL_INCLUDE_DIRS})
     if(OS_IS_MACOSX)
         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL")

src/core/libs/CMakeLists.txt

@@ -23,6 +23,7 @@ set(CORE_LIBS_SOURCES
     INIReader.cc
     string_converter.cc
     gnss_sdr_supl_client.cc
+    gnss_sdr_sample_counter.cc
 )
 
 set(CORE_LIBS_HEADERS
@@ -30,8 +31,22 @@ set(CORE_LIBS_HEADERS
     INIReader.h
     string_converter.h
     gnss_sdr_supl_client.h
+    gnss_sdr_sample_counter.h
 )
 
+if(ENABLE_FPGA)
+    set(CORE_LIBS_SOURCES
+        ${CORE_LIBS_SOURCES}
+        gnss_sdr_fpga_sample_counter.cc
+        gnss_sdr_time_counter.cc
+    )
+    set(CORE_LIBS_HEADERS
+        ${CORE_LIBS_HEADERS}
+        gnss_sdr_fpga_sample_counter.h
+        gnss_sdr_time_counter.h
+    )
+endif()
+
 list(SORT CORE_LIBS_HEADERS)
 list(SORT CORE_LIBS_SOURCES)
 
@@ -42,6 +57,7 @@ add_library(core_libs ${CORE_LIBS_SOURCES} ${CORE_LIBS_HEADERS})
 target_link_libraries(core_libs
     PUBLIC
         Boost::boost
+        Gnuradio::runtime
         core_libs_supl
         core_system_parameters
     PRIVATE
@@ -51,6 +67,7 @@ target_link_libraries(core_libs
         Pugixml::pugixml
 )
 
+
 if(ENABLE_CLANG_TIDY)
     if(CLANG_TIDY_EXE)
         set_target_properties(core_libs

src/core/libs/gnss_sdr_sample_counter.h

@@ -28,8 +28,9 @@
  *
  * -------------------------------------------------------------------------
  */
-#ifndef GNSS_SDR_SAMPLE_COUNTER_H_
+
-#define GNSS_SDR_SAMPLE_COUNTER_H_
+#ifndef GNSS_SDR_GNSS_SDR_SAMPLE_COUNTER_H_
+#define GNSS_SDR_GNSS_SDR_SAMPLE_COUNTER_H_
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/sync_decimator.h>
@@ -73,4 +74,4 @@ public:
         gr_vector_void_star &output_items);
 };
 
-#endif /*GNSS_SDR_SAMPLE_COUNTER_H_*/
+#endif /*GNSS_SDR_GNSS_SDR_SAMPLE_COUNTER_H_*/

src/core/libs/gnss_sdr_time_counter.h

@@ -28,8 +28,9 @@
  *
  * -------------------------------------------------------------------------
  */
-#ifndef GNSS_SDR_TIME_COUNTER_H_
+
-#define GNSS_SDR_TIME_COUNTER_H_
+#ifndef GNSS_SDR_GNSS_SDR_TIME_COUNTER_H_
+#define GNSS_SDR_GNSS_SDR_TIME_COUNTER_H_
 
 #include <boost/shared_ptr.hpp>
 #include <gnuradio/block.h>
@@ -55,11 +56,11 @@ private:
     bool flag_days;           // True if the receiver has been running for at least 1 day
     uint32_t current_days;    // Receiver time in days since the beginning of the run
     int32_t report_interval_ms;
+    friend gnss_sdr_time_counter_sptr gnss_sdr_make_time_counter();
 
 public:
-    friend gnss_sdr_time_counter_sptr gnss_sdr_make_time_counter();
     int general_work(int noutput_items __attribute__((unused)), gr_vector_int &ninput_items __attribute__((unused)),
         gr_vector_const_void_star &input_items __attribute__((unused)), gr_vector_void_star &output_items);
 };
 
-#endif /*GNSS_SDR_SAMPLE_COUNTER_H_*/
+#endif /*GNSS_SDR_GNSS_SDR_SAMPLE_COUNTER_H_*/