Release v2.4.3

eProsima · Mar 20, 2024 · 6734a50 · 6734a50
2 parents 4f8983e + b86dec5
commit 6734a50
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,11 +27,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
-project(microxrcedds VERSION "2.4.2")
+project(microxrcedds VERSION "2.4.3")
 
-set(_client_tag v2.4.2)
-set(_client_version 2.4.2)
-set(_agent_tag v2.4.2)
+set(_client_tag v2.4.3)
+set(_client_version 2.4.3)
+set(_agent_tag v2.4.3)
 set(_gen_tag v2.0.2)
 
 ###############################################################################

diff --git a/test/test/client_agent/CMakeLists.txt b/test/test/client_agent/CMakeLists.txt
@@ -28,14 +28,26 @@ endif()
 
 add_executable(client-agent-test ${SRCS})
 
-add_gtest(client-agent-test
+gtest_add_tests(
+    TARGET
+        client-agent-test
     SOURCES
         ${SRCS}
-    ENVIRONMENTS
-        $<$<PLATFORM_ID:Linux>:LD_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib>
-        $<$<PLATFORM_ID:Windows>:PATH=${CMAKE_PREFIX_PATH}/bin>
+    TEST_LIST
+        allClientAgentTests
     )
 
+if(WIN32)
+    set(PATH_ENV "$ENV{PATH}")
+    string(REPLACE ";" "\\;" PATH_ENV "${PATH_ENV}")
+
+    set_tests_properties(${allClientAgentTests} PROPERTIES ENVIRONMENT
+        "PATH=${CMAKE_PREFIX_PATH}/bin\\;${PATH_ENV}")
+else()
+    set_tests_properties(${allClientAgentTests} PROPERTIES ENVIRONMENT
+        "LD_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib")
+endif()
+
 target_include_directories(client-agent-test
     PRIVATE
         ${GTEST_INCLUDE_DIR}

diff --git a/test/test/discovery/CMakeLists.txt b/test/test/discovery/CMakeLists.txt
@@ -21,14 +21,26 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/DEFAULT_FASTRTPS_PROFILES.xml.in
 
 add_executable(discovery-test DiscoveryIntegration.cpp)
 
-add_gtest(discovery-test
+gtest_add_tests(
+    TARGET
+        discovery-test
     SOURCES
         DiscoveryIntegration.cpp
-    ENVIRONMENTS
-        $<$<PLATFORM_ID:Linux>:LD_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib>
-        $<$<PLATFORM_ID:Windows>:PATH=${CMAKE_PREFIX_PATH}/bin>
+    TEST_LIST
+        allDiscoveryTest
     )
 
+if(WIN32)
+    set(PATH_ENV "$ENV{PATH}")
+    string(REPLACE ";" "\\;" PATH_ENV "${PATH_ENV}")
+
+    set_tests_properties(${allDiscoveryTest} PROPERTIES ENVIRONMENT
+        "PATH=${CMAKE_PREFIX_PATH}/bin\\;${PATH_ENV}")
+else()
+    set_tests_properties(${allDiscoveryTest} PROPERTIES ENVIRONMENT
+        "LD_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib")
+endif()
+
 target_include_directories(discovery-test
     PRIVATE
         ${GTEST_INCLUDE_DIR}

diff --git a/test/test/publisher_subscriber/CMakeLists.txt b/test/test/publisher_subscriber/CMakeLists.txt
@@ -28,14 +28,26 @@ endif()
 
 add_executable(publisher-subscriber-interaction-test ${SRCS})
 
-add_gtest(publisher-subscriber-interaction-test
+gtest_add_tests(
+    TARGET
+        publisher-subscriber-interaction-test
     SOURCES
         ${SRCS}
-    ENVIRONMENTS
-        $<$<PLATFORM_ID:Linux>:LD_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib>
-        $<$<PLATFORM_ID:Windows>:PATH=${CMAKE_PREFIX_PATH}/bin>
+    TEST_LIST
+        allPublisherSubscriberInteractionTests
     )
 
+if(WIN32)
+    set(PATH_ENV "$ENV{PATH}")
+    string(REPLACE ";" "\\;" PATH_ENV "${PATH_ENV}")
+
+    set_tests_properties(${allPublisherSubscriberInteractionTests} PROPERTIES ENVIRONMENT
+        "PATH=${CMAKE_PREFIX_PATH}/bin\\;${PATH_ENV}")
+else()
+    set_tests_properties(${allPublisherSubscriberInteractionTests} PROPERTIES ENVIRONMENT
+        "LD_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib")
+endif()
+
 target_include_directories(publisher-subscriber-interaction-test
     PRIVATE
         ${GTEST_INCLUDE_DIR}

diff --git a/test/test/shapes_demo/CMakeLists.txt b/test/test/shapes_demo/CMakeLists.txt
@@ -25,14 +25,27 @@ endif()
 set(SRCS ShapesDemo.cpp)
 
 add_executable(shapes_demo_test ${SRCS})
-add_gtest(shapes_demo_test
+
+gtest_add_tests(
+    TARGET
+        shapes_demo_test
     SOURCES
         ${SRCS}
-    ENVIRONMENTS
-        $<$<PLATFORM_ID:Linux>:LD_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib>
-        $<$<PLATFORM_ID:Windows>:PATH=${CMAKE_PREFIX_PATH}/bin>
+    TEST_LIST
+        allShapesDemoTests
     )
 
+if(WIN32)
+    set(PATH_ENV "$ENV{PATH}")
+    string(REPLACE ";" "\\;" PATH_ENV "${PATH_ENV}")
+
+    set_tests_properties(${allShapesDemoTests} PROPERTIES ENVIRONMENT
+        "PATH=${CMAKE_PREFIX_PATH}/bin\\;${PATH_ENV}")
+else()
+    set_tests_properties(${allShapesDemoTests} PROPERTIES ENVIRONMENT
+        "LD_LIBRARY_PATH=${CMAKE_PREFIX_PATH}/lib")
+endif()
+
 target_include_directories(shapes_demo_test
     PRIVATE
         ${PROJECT_BINARY_DIR}/include