Reorder files

src/core/CMakeLists.txt

@@ -16,7 +16,6 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
-add_subdirectory(protobuf)
 add_subdirectory(system_parameters)
 add_subdirectory(libs)
 add_subdirectory(receiver)

src/core/monitor/CMakeLists.txt

@@ -16,15 +16,19 @@
 # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
 #
 
+protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${CMAKE_SOURCE_DIR}/docs/protobuf/gnss_synchro.proto)
 
 set(CORE_MONITOR_LIBS_SOURCES
     gnss_synchro_monitor.cc
     gnss_synchro_udp_sink.cc
+    ${PROTO_SRCS}
 )
 
 set(CORE_MONITOR_LIBS_HEADERS
     gnss_synchro_monitor.h
     gnss_synchro_udp_sink.h
+    serdes_gnss_synchro.h
+    ${PROTO_HDRS}
 )
 
 list(SORT CORE_MONITOR_LIBS_HEADERS)
@@ -42,12 +46,19 @@ target_link_libraries(core_monitor
         Boost::serialization
         Boost::system
         Gnuradio::runtime
+        protobuf::libprotobuf
         core_system_parameters
-        core_protobuf
     PRIVATE
         Gnuradio::pmt
 )
 
+get_filename_component(PROTO_INCLUDE_HEADERS ${PROTO_HDRS} DIRECTORY)
+
+target_include_directories(core_monitor
+    PUBLIC
+        ${PROTO_INCLUDE_HEADERS}
+)
+
 if(OS_IS_MACOSX)
     if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")  # not AppleClang
         target_compile_definitions(core_monitor
@@ -66,7 +77,10 @@ if(ENABLE_CLANG_TIDY)
     endif()
 endif()
 
+
+
 set_property(TARGET core_monitor
     APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+        $<BUILD_INTERFACE:${PROTO_INCLUDE_HEADERS}>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
 )

src/core/protobuf/CMakeLists.txt

@@ -1,37 +0,0 @@
-# Copyright (C) 2012-2019  (see AUTHORS file for a list of contributors)
-#
-# This file is part of GNSS-SDR.
-#
-# GNSS-SDR is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GNSS-SDR is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
-#
-
-protobuf_generate_cpp(PROTO_SRCS PROTO_HDRS ${CMAKE_SOURCE_DIR}/docs/protobuf/gnss_synchro.proto)
-
-add_library(core_protobuf serdes_gnss_synchro.h ${PROTO_SRCS} ${PROTO_HDRS})
-target_link_libraries(core_protobuf
-    PUBLIC
-        protobuf::libprotobuf
-)
-
-target_include_directories(core_protobuf
-    PUBLIC
-        ${CMAKE_SOURCE_DIR}/src/core/system_parameters
-)
-
-get_filename_component(PROTO_INCLUDE_HEADERS ${PROTO_HDRS} DIRECTORY)
-set_property(TARGET core_protobuf
-    APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
-        $<BUILD_INTERFACE:${PROTO_INCLUDE_HEADERS}>
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-)

src/tests/CMakeLists.txt

@@ -393,7 +393,6 @@ if(ENABLE_UNIT_TESTING)
             system_testing_lib
             core_receiver
             core_system_parameters
-            core_protobuf
     )
     if(ENABLE_UNIT_TESTING_EXTRA)
         target_link_libraries(run_tests PUBLIC Gpstk::gpstk)