Apply changes

Signed-off-by: Irene Bandera <irenebandera@eprosima.com>
eProsima · Jan 19, 2024 · a70342c · a70342c
1 parent dd63b22
commit a70342c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 30 deletions.
diff --git a/controller/controller_tool/CMakeLists.txt b/controller/controller_tool/CMakeLists.txt
@@ -55,14 +55,14 @@ if (BUILD_DDSRECORDER_CONTROLLER)
 
     # Determine Fast DDS version
     if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
-        set(FASTDDS_SUBDIRECTORY "v1")
+        set(DDS_TYPES_VERSION "v1")
     else()
-        set(FASTDDS_SUBDIRECTORY "v2")
+        set(DDS_TYPES_VERSION "v2")
     endif()
 
     # Add subdirectory based on Fast DDS version
-    add_subdirectory(ddstypes/${FASTDDS_SUBDIRECTORY}/DdsRecorderCommand)
-    add_subdirectory(ddstypes/${FASTDDS_SUBDIRECTORY}/DdsRecorderStatus)
+    add_subdirectory(ddstypes/${DDS_TYPES_VERSION}/DdsRecorderCommand)
+    add_subdirectory(ddstypes/${DDS_TYPES_VERSION}/DdsRecorderStatus)
 
     ###############################################################################
     # Install Tool

diff --git a/ddsrecorder/CMakeLists.txt b/ddsrecorder/CMakeLists.txt
@@ -62,21 +62,28 @@ configure_project_cpp()
 
 # Determine Fast DDS version
 if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
-    set(FASTDDS_SUBDIRECTORY "/v2/")
+    set(DDS_TYPES_VERSION "/v1/")
 else()
-    set(FASTDDS_SUBDIRECTORY "/v1/")
+    set(DDS_TYPES_VERSION "/v2/")
 endif()
 
-file(GLOB_RECURSE SOURCES_FILES "${PROJECT_SOURCE_DIR}/src/cpp/")
-foreach(SOURCE_FILE ${SOURCES_FILES})
-    if(NOT SOURCE_FILE MATCHES ${FASTDDS_SUBDIRECTORY})
-        compile_tool(${SOURCE_FILE})
-    endif()
-endforeach()
+file(
+    GLOB_RECURSE SOURCES_FILES
+        "${PROJECT_SOURCE_DIR}/src/cpp/tool/*.cpp"
+        "${PROJECT_SOURCE_DIR}/src/cpp/user_interface/*.cpp"
+        "${PROJECT_SOURCE_DIR}/src/cpp/main.cpp"
+        "${PROJECT_SOURCE_DIR}/src/cpp/command_receiver/*.cpp"
+        "${PROJECT_SOURCE_DIR}/src/cpp/**/**${DDS_TYPES_VERSION}**/*.cxx"
+    )
+
+compile_tool(
+    "${PROJECT_SOURCE_DIR}/src/cpp/" # Source directory
+    "${SOURCES_FILES}"
+)
 
 file(GLOB_RECURSE TEST_FILES "${PROJECT_SOURCE_DIR}/test/")
 foreach(TEST_FILE ${TEST_FILES})
-    if(NOT TEST_FILE MATCHES ${FASTDDS_SUBDIRECTORY})
+    if(NOT TEST_FILE MATCHES ${DDS_TYPES_VERSION})
         compile_test_tool(${TEST_FILE})
     endif()
 endforeach()

diff --git a/ddsrecorder/test/blackbox/mcap/CMakeLists.txt b/ddsrecorder/test/blackbox/mcap/CMakeLists.txt
@@ -20,17 +20,17 @@ set(TEST_NAME McapFileCreationTest)
 
 # Determine Fast DDS version
 if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
-    set(FASTDDS_SUBDIRECTORY "v1")
+    set(DDS_TYPES_VERSION "v1")
 else()
-    set(FASTDDS_SUBDIRECTORY "v2")
+    set(DDS_TYPES_VERSION "v2")
 endif()
 
 set(TEST_SOURCES
         McapFileCreationTest.cpp
-        ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorld.cxx
-        ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldPubSubTypes.cxx
-        ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldTypeObject.cxx
-        $<$<STREQUAL:${FASTDDS_SUBDIRECTORY},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/v2/hello_world/HelloWorldv1.cxx>
+        ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${DDS_TYPES_VERSION}/hello_world/HelloWorld.cxx
+        ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${DDS_TYPES_VERSION}/hello_world/HelloWorldPubSubTypes.cxx
+        ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${DDS_TYPES_VERSION}/hello_world/HelloWorldTypeObject.cxx
+        $<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/v2/hello_world/HelloWorldv1.cxx>
 )
 
 set(TEST_LIST
@@ -66,8 +66,8 @@ set(TEST_NEEDED_SOURCES
     )
 
 set(TEST_EXTRA_HEADERS
-    ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY}/hello_world
-    ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${FASTDDS_SUBDIRECTORY})
+    ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${DDS_TYPES_VERSION}/hello_world
+    ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/types/${DDS_TYPES_VERSION})
 
 add_blackbox_executable(
     "${TEST_NAME}"

diff --git a/ddsrecorder_participants/CMakeLists.txt b/ddsrecorder_participants/CMakeLists.txt
@@ -62,24 +62,24 @@ configure_project_cpp()
 
 # Determine Fast DDS version
 if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
-    set(FASTDDS_SUBDIRECTORY "/v1/")
+    set(DDS_TYPES_VERSION "/v1/")
 else()
-    set(FASTDDS_SUBDIRECTORY "/v2/")
+    set(DDS_TYPES_VERSION "/v2/")
 endif()
 
 file(
     GLOB_RECURSE SOURCES_FILES
         "${PROJECT_SOURCE_DIR}/src/cpp/replayer/*.cpp"
         "${PROJECT_SOURCE_DIR}/src/cpp/recorder/**/*.cpp"
-        "${PROJECT_SOURCE_DIR}/src/cpp/**/**${FASTDDS_SUBDIRECTORY}*.cpp"
+        "${PROJECT_SOURCE_DIR}/src/cpp/**/**${DDS_TYPES_VERSION}*.cpp"
     )
 
 file(
     GLOB_RECURSE HEADERS_FILES
         ${PROJECT_SOURCE_DIR}/include/constants.hpp
         ${PROJECT_SOURCE_DIR}/include/replayer/*.hpp
         ${PROJECT_SOURCE_DIR}/include/recorder/**/*.hpp
-        ${PROJECT_SOURCE_DIR}/include/**/**${FASTDDS_SUBDIRECTORY}*.hpp
+        ${PROJECT_SOURCE_DIR}/include/**/**${DDS_TYPES_VERSION}*.hpp
     )
 
 # Compile C++ library

diff --git a/ddsreplayer/test/blackbox/mcap/CMakeLists.txt b/ddsreplayer/test/blackbox/mcap/CMakeLists.txt
@@ -20,16 +20,16 @@ set(TEST_NAME McapFileReadTest)
 
 # Determine Fast DDS version
 if ("${fastrtps_VERSION}" VERSION_LESS 2.13)
-    set(FASTDDS_SUBDIRECTORY "v1")
+    set(DDS_TYPES_VERSION "v1")
 else()
-    set(FASTDDS_SUBDIRECTORY "v2")
+    set(DDS_TYPES_VERSION "v2")
 endif()
 
 set(TEST_SOURCES
     McapFileReadTest.cpp
-    ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorld.cxx
-    $<$<STREQUAL:${FASTDDS_SUBDIRECTORY},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/v2/hello_world/HelloWorldv1.cxx>
-    ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/${FASTDDS_SUBDIRECTORY}/hello_world/HelloWorldPubSubTypes.cxx
+    ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/${DDS_TYPES_VERSION}/hello_world/HelloWorld.cxx
+    $<$<STREQUAL:${DDS_TYPES_VERSION},v2>:${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/v2/hello_world/HelloWorldv1.cxx>
+    ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/types/${DDS_TYPES_VERSION}/hello_world/HelloWorldPubSubTypes.cxx
     ${PROJECT_SOURCE_DIR}/test/blackbox/mcap/dds/HelloWorldSubscriber.cpp
 )