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) 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() 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)