From 6a9f116777e2db1ffeb8da31f137f82036bcddd8 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Thu, 17 Jul 2025 19:25:00 +0200 Subject: [PATCH 1/3] fix cmake deprecation cmake version < then 3.10 is deprecated --- osrf_testing_tools_cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osrf_testing_tools_cpp/CMakeLists.txt b/osrf_testing_tools_cpp/CMakeLists.txt index af90371..97f7726 100644 --- a/osrf_testing_tools_cpp/CMakeLists.txt +++ b/osrf_testing_tools_cpp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.20) project(osrf_testing_tools_cpp) From 6408a54d7d30b036fbc60b27a9dac78de9e5ddff Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Thu, 17 Jul 2025 19:26:01 +0200 Subject: [PATCH 2/3] Update CMakeLists.txt --- test_osrf_testing_tools_cpp/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_osrf_testing_tools_cpp/CMakeLists.txt b/test_osrf_testing_tools_cpp/CMakeLists.txt index 9262069..0de7bcc 100644 --- a/test_osrf_testing_tools_cpp/CMakeLists.txt +++ b/test_osrf_testing_tools_cpp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.20) project(test_osrf_testing_tools_cpp) From 026ef936cf1b3001168a4aef648ef7179828cc41 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Thu, 17 Jul 2025 19:31:13 +0200 Subject: [PATCH 3/3] Update osrf_testing_tools_cpp_extract_and_build_googletest.cmake --- ...srf_testing_tools_cpp_extract_and_build_googletest.cmake | 6 ------ 1 file changed, 6 deletions(-) diff --git a/osrf_testing_tools_cpp/cmake/osrf_testing_tools_cpp_extract_and_build_googletest.cmake b/osrf_testing_tools_cpp/cmake/osrf_testing_tools_cpp_extract_and_build_googletest.cmake index 709ed38..b359901 100644 --- a/osrf_testing_tools_cpp/cmake/osrf_testing_tools_cpp_extract_and_build_googletest.cmake +++ b/osrf_testing_tools_cpp/cmake/osrf_testing_tools_cpp_extract_and_build_googletest.cmake @@ -95,10 +95,4 @@ macro(osrf_testing_tools_cpp_extract_and_build_googletest endif() endif() - # The gtest/gtest_main targets carry header search path - # dependencies automatically when using CMake 2.8.11 or - # later. Otherwise we have to add them here ourselves. - if (CMAKE_VERSION VERSION_LESS 2.8.11) - include_directories("${gtest_SOURCE_DIR}/include") - endif() endmacro()