Increase cmake minimum required (#335)

* Refs #16427. Increase cmake minimum required Signed-off-by: Ricardo González Moreno <[email protected]> * Refs #16427. Update googletest Signed-off-by: Ricardo González Moreno <[email protected]> * Fix tests Signed-off-by: Pablo Garrido <[email protected]> * Fix tests Signed-off-by: Pablo Garrido <[email protected]> Signed-off-by: Ricardo González Moreno <[email protected]> Signed-off-by: Pablo Garrido <[email protected]> Co-authored-by: Pablo Garrido <[email protected]>
eProsima · Dec 8, 2022 · bb23a27 · bb23a27
1 parent f929700
commit bb23a27
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@
 ################################################################################
 ## CMake build rules for Micro XRCE-DDS Client
 ################################################################################
-cmake_minimum_required(VERSION 3.5.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16)
 
 ###############################################################################
 # Build options

diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake
@@ -66,7 +66,7 @@ if(UCLIENT_BUILD_TESTS)
             GIT_REPOSITORY
                 https://github.com/google/googletest.git
             GIT_TAG
-                2fe3bd994b3189899d93f1d5a881e725e046fdc2
+                release-1.11.0
             PREFIX
                 ${PROJECT_BINARY_DIR}/googletest
             INSTALL_DIR
@@ -98,4 +98,4 @@ ExternalProject_Add(uclient
         ""
     DEPENDS
         ${_deps}
-    )
+    )
diff --git a/examples/Deployment/configurator_client.c b/examples/Deployment/configurator_client.c
@@ -55,7 +55,7 @@ int main(
         char** argv)
 {
     // Check args
-    uint32_t key;
+    uint32_t key = 0;
     int create_delete = 0;
     int pub_sub = 0;
     uint16_t ids = 0;

diff --git a/examples/ReplyAdder/main.c b/examples/ReplyAdder/main.c
@@ -146,6 +146,7 @@ int main(
     delivery_control.max_samples = UXR_MAX_SAMPLES_UNLIMITED;
     uint16_t read_data_req =
             uxr_buffer_request_data(&session, reliable_out, replier_id, reliable_in, &delivery_control);
+    (void) read_data_req;
 
     // Read request
     bool connected = true;

diff --git a/test/shared_memory/SharedMemory.cpp b/test/shared_memory/SharedMemory.cpp
@@ -999,7 +999,13 @@ TEST_P(SharedMemoryTest, SharedMemoryReqRepFragmentation)
 }
 #endif // ifdef UCLIENT_PROFILE_MULTITHREAD
 
-INSTANTIATE_TEST_CASE_P(
+#ifdef INSTANTIATE_TEST_SUITE_P
+#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_SUITE_P(x, y, z, w)
+#else
+#define GTEST_INSTANTIATE_TEST_MACRO(x, y, z, w) INSTANTIATE_TEST_CASE_P(x, y, z, w)
+#endif // ifdef INSTANTIATE_TEST_SUITE_P
+
+GTEST_INSTANTIATE_TEST_MACRO(
     SharedMemoryTest,
     SharedMemoryTest,
     ::testing::Values(XRCECreationMode::XRCE_XML_CREATION, XRCECreationMode::XRCE_BIN_CREATION),

diff --git a/test/unitary/session/Session.cpp b/test/unitary/session/Session.cpp
@@ -32,6 +32,7 @@ extern "C"
 #include <string>
 #include <array>
 #include <vector>
+#include <algorithm>
 
 #define MTU                   64
 #define HISTORY               4