Increase cmake minimum required according to fastdds (#323)

* Refs #16427. Increase cmake minimum required according to fastdds Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Refs #16427. Fix googletest warning Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> * Set client develop branch Signed-off-by: Pablo Garrido <pablogs9@gmail.com> Signed-off-by: Ricardo González Moreno <ricardo@richiware.dev> Signed-off-by: Pablo Garrido <pablogs9@gmail.com> Co-authored-by: Pablo Garrido <pablogs9@gmail.com>
eProsima · Dec 9, 2022 · c00bd1c · c00bd1c
1 parent 021828f
commit c00bd1c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@
 ###############################################################################
 # CMake build rules for Micro XRCE-DDS Agent
 ###############################################################################
-cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
 
 ###############################################################################
 # Build options
@@ -41,7 +41,7 @@ option(UAGENT_BUILD_EXECUTABLE "Build Micro XRCE-DDS Agent provided executable."
 option(UAGENT_BUILD_USAGE_EXAMPLES "Build Micro XRCE-DDS Agent built-in usage examples" OFF)
 
 set(UAGENT_P2P_CLIENT_VERSION 2.2.1 CACHE STRING "Sets Micro XRCE-DDS client version for P2P")
-set(UAGENT_P2P_CLIENT_TAG v2.2.1 CACHE STRING "Sets Micro XRCE-DDS client tag for P2P")
+set(UAGENT_P2P_CLIENT_TAG develop CACHE STRING "Sets Micro XRCE-DDS client tag for P2P")
 
 option(UAGENT_BUILD_CI_TESTS "Build CI test cases.")
 if(UAGENT_BUILD_CI_TESTS)

diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
@@ -201,7 +201,7 @@ if(UAGENT_BUILD_TESTS)
             GIT_REPOSITORY
                 https://github.com/google/googletest.git
             GIT_TAG
-                2fe3bd994b3189899d93f1d5a881e725e046fdc2
+                release-1.11.0
             PREFIX
                 ${PROJECT_BINARY_DIR}/googletest
             INSTALL_DIR

diff --git a/test/unittest/agent/AgentUnitTests.cpp b/test/unittest/agent/AgentUnitTests.cpp
@@ -1077,7 +1077,13 @@ TEST_P(AgentUnitTests, RegisterCallbackFunctions)
 
 // TODO (pablogs): Add tests for binary entity creation
 
-INSTANTIATE_TEST_CASE_P(AgentUnitTestsParams,
+#ifdef INSTANTIATE_TEST_SUITE_P
+#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_SUITE_P(x, y, z)
+#else
+#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z) INSTANTIATE_TEST_CASE_P(x, y, z)
+#endif // ifdef INSTANTIATE_TEST_SUITE_P
+
+GTEST_INSTANTIATE_TEST_MACRO(AgentUnitTestsParams,
                         AgentUnitTests,
                         ::testing::Values(Middleware::Kind::FASTRTPS,Middleware::Kind::FASTDDS));