Add an aggregate novatel_edie::novatel_edie target

valgur · Sep 30, 2024 · 16459a5 · 16459a5
1 parent 3a782b5
commit 16459a5
Show file tree

Hide file tree

Showing 17 changed files with 25 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -118,6 +118,16 @@ add_subdirectory(src/stream_interface)
 add_subdirectory(src/decoders/common)
 add_subdirectory(src/decoders/oem)
 
+# Add an aggregate target for all components
+add_library(novatel_edie INTERFACE)
+add_library(novatel_edie::novatel_edie ALIAS novatel_edie)
+target_link_libraries(novatel_edie INTERFACE
+    common
+    stream_interface
+    decoders_common
+    oem_decoder
+)
+
 if(BUILD_TESTS)
     enable_testing()
     add_subdirectory(src/common/test)

diff --git a/examples/novatel/command_encoding/CMakeLists.txt b/examples/novatel/command_encoding/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(TARGET_NAME "command_encoding")
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
-target_link_libraries(${TARGET_NAME} novatel_edie::oem_decoder novatel_edie::stream_interface)
+target_link_libraries(${TARGET_NAME} novatel_edie::novatel_edie)
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "examples")
diff --git a/examples/novatel/converter_components/CMakeLists.txt b/examples/novatel/converter_components/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(TARGET_NAME "converter_components")
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
-target_link_libraries(${TARGET_NAME} novatel_edie::oem_decoder novatel_edie::stream_interface)
+target_link_libraries(${TARGET_NAME} novatel_edie::novatel_edie)
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "examples")
diff --git a/examples/novatel/converter_file_parser/CMakeLists.txt b/examples/novatel/converter_file_parser/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(TARGET_NAME "converter_file_parser")
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
-target_link_libraries(${TARGET_NAME} novatel_edie::oem_decoder novatel_edie::stream_interface)
+target_link_libraries(${TARGET_NAME} novatel_edie::novatel_edie)
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "examples")
diff --git a/examples/novatel/converter_parser/CMakeLists.txt b/examples/novatel/converter_parser/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(TARGET_NAME "converter_parser")
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
-target_link_libraries(${TARGET_NAME} novatel_edie::oem_decoder novatel_edie::stream_interface)
+target_link_libraries(${TARGET_NAME} novatel_edie::novatel_edie)
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "examples")
diff --git a/examples/novatel/json_parser/CMakeLists.txt b/examples/novatel/json_parser/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(TARGET_NAME "json_parser")
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
-target_link_libraries(${TARGET_NAME} novatel_edie::oem_decoder novatel_edie::stream_interface)
+target_link_libraries(${TARGET_NAME} novatel_edie::novatel_edie)
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "examples")
diff --git a/examples/novatel/range_decompressor/CMakeLists.txt b/examples/novatel/range_decompressor/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(TARGET_NAME "range_decompressor")
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
-target_link_libraries(${TARGET_NAME} novatel_edie::oem_decoder novatel_edie::stream_interface)
+target_link_libraries(${TARGET_NAME} novatel_edie::novatel_edie)
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "examples")
diff --git a/examples/novatel/rangecmp/CMakeLists.txt b/examples/novatel/rangecmp/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(TARGET_NAME "range_decompressor")
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
-target_link_libraries(${TARGET_NAME} novatel_edie::oem_decoder novatel_edie::stream_interface)
+target_link_libraries(${TARGET_NAME} novatel_edie::novatel_edie)
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "examples")
diff --git a/examples/novatel/rxconfig_handler/CMakeLists.txt b/examples/novatel/rxconfig_handler/CMakeLists.txt
@@ -1,4 +1,4 @@
 set(TARGET_NAME "rxconfig_handler")
 add_executable(${TARGET_NAME} ${TARGET_NAME}.cpp)
-target_link_libraries(${TARGET_NAME} novatel_edie::oem_decoder novatel_edie::stream_interface)
+target_link_libraries(${TARGET_NAME} novatel_edie::novatel_edie)
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "examples")
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(TARGET_NAME "common")
 file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 add_library(${TARGET_NAME} STATIC ${SOURCES})
-add_library(novatel_edie::${TARGET_NAME} ALIAS ${TARGET_NAME})
 set_target_properties(${TARGET_NAME} PROPERTIES
     OUTPUT_NAME "edie_${TARGET_NAME}"
     FOLDER "common"

diff --git a/src/common/test/CMakeLists.txt b/src/common/test/CMakeLists.txt
@@ -3,5 +3,5 @@ file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 add_executable(${TARGET_NAME} ${SOURCES})
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "common/tests")
 find_package(GTest REQUIRED CONFIG)
-target_link_libraries(${TARGET_NAME} PUBLIC novatel_edie::common GTest::gtest GTest::gtest_main)
+target_link_libraries(${TARGET_NAME} PUBLIC common GTest::gtest GTest::gtest_main)
 add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME} ${CMAKE_SOURCE_DIR})
diff --git a/src/decoders/common/CMakeLists.txt b/src/decoders/common/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(TARGET_NAME "decoders_common")
 file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 add_library(${TARGET_NAME} STATIC ${SOURCES})
-add_library(novatel_edie::${TARGET_NAME} ALIAS ${TARGET_NAME})
 set_target_properties(${TARGET_NAME} PROPERTIES
     OUTPUT_NAME "edie_${TARGET_NAME}"
     FOLDER "decoders"
@@ -14,6 +13,6 @@ target_compile_features(${TARGET_NAME} PUBLIC cxx_std_17)
 
 find_package(nlohmann_json REQUIRED CONFIG)
 target_link_libraries(${TARGET_NAME} PUBLIC
-    novatel_edie::common
+    common
     nlohmann_json::nlohmann_json
 )
diff --git a/src/decoders/common/test/CMakeLists.txt b/src/decoders/common/test/CMakeLists.txt
@@ -3,5 +3,5 @@ file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
 add_executable(${TARGET_NAME} ${SOURCES})
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "decoders/tests")
 find_package(GTest REQUIRED CONFIG)
-target_link_libraries(${TARGET_NAME} PUBLIC novatel_edie::decoders_common GTest::gtest GTest::gtest_main)
+target_link_libraries(${TARGET_NAME} PUBLIC decoders_common GTest::gtest GTest::gtest_main)
 add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME} ${CMAKE_SOURCE_DIR})
diff --git a/src/decoders/oem/CMakeLists.txt b/src/decoders/oem/CMakeLists.txt
@@ -1,12 +1,11 @@
 set(TARGET_NAME "oem_decoder")
 file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 add_library(${TARGET_NAME} STATIC ${SOURCES})
-add_library(novatel_edie::${TARGET_NAME} ALIAS ${TARGET_NAME})
 set_target_properties(${TARGET_NAME} PROPERTIES
     OUTPUT_NAME "edie_${TARGET_NAME}"
     FOLDER "decoders"
 )
-target_link_libraries(${TARGET_NAME} PUBLIC novatel_edie::common decoders_common stream_interface)
+target_link_libraries(${TARGET_NAME} PUBLIC common decoders_common stream_interface)
 target_include_directories(${TARGET_NAME} PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>

diff --git a/src/decoders/oem/test/CMakeLists.txt b/src/decoders/oem/test/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(${TARGET_NAME} ${SOURCES})
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "decoders/tests")
 find_package(GTest REQUIRED CONFIG)
 target_link_libraries(${TARGET_NAME} PUBLIC
-    novatel_edie::oem_decoder novatel_edie::stream_interface
+    oem_decoder stream_interface
     GTest::gtest GTest::gtest_main
 )
 add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME} ${CMAKE_SOURCE_DIR})
diff --git a/src/stream_interface/CMakeLists.txt b/src/stream_interface/CMakeLists.txt
@@ -1,12 +1,11 @@
 set(TARGET_NAME "stream_interface")
 file(GLOB_RECURSE SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 add_library(${TARGET_NAME} STATIC ${SOURCES})
-add_library(novatel_edie::${TARGET_NAME} ALIAS ${TARGET_NAME})
 set_target_properties(${TARGET_NAME} PROPERTIES
     OUTPUT_NAME "edie_${TARGET_NAME}"
     FOLDER "hw_interface"
 )
-target_link_libraries(${TARGET_NAME} PRIVATE novatel_edie::common)
+target_link_libraries(${TARGET_NAME} PRIVATE common)
 target_include_directories(${TARGET_NAME} PUBLIC
     $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
     $<INSTALL_INTERFACE:include>

diff --git a/src/stream_interface/test/CMakeLists.txt b/src/stream_interface/test/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(${TARGET_NAME} ${SOURCES})
 set_property(TARGET ${TARGET_NAME} PROPERTY FOLDER "hw_interface/tests")
 find_package(GTest REQUIRED CONFIG)
 target_link_libraries(${TARGET_NAME} PUBLIC
-    novatel_edie::stream_interface
+    stream_interface
     GTest::gtest GTest::gtest_main
 )
 add_test(NAME ${TARGET_NAME} COMMAND ${TARGET_NAME} ${CMAKE_SOURCE_DIR})