Revert "cmake: attempt for older cmake on Ubuntu 20.04"

This reverts commit c416860.
mavlink · May 24, 2024 · c2493af · c2493af
1 parent 36d18e9
commit c2493af
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 32 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -73,38 +73,6 @@ include(cmake/static_analyzers.cmake)
 if(BUILD_TESTS)
     enable_testing()
 
-    hunter_add_package(GTest)
-    find_package(GTest REQUIRED)
-
-    # Check if the GTest::gtest target exists, for older cmake with Ubuntu 20.04
-
-    # Check and create GTest::gtest if not available
-    if(NOT TARGET GTest::gtest)
-        add_library(GTest::gtest INTERFACE IMPORTED)
-        set_property(TARGET GTest::gtest PROPERTY
-            INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS})
-        set_property(TARGET GTest::gtest PROPERTY
-            INTERFACE_LINK_LIBRARIES ${GTEST_BOTH_LIBRARIES})
-    endif()
-
-    # Check and create GTest::gtest_main if not available
-    if(NOT TARGET GTest::gtest_main)
-        add_library(GTest::gtest_main INTERFACE IMPORTED)
-        set_property(TARGET GTest::gtest_main PROPERTY
-            INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIRS})
-        set_property(TARGET GTest::gtest_main PROPERTY
-            INTERFACE_LINK_LIBRARIES ${GTEST_MAIN_LIBRARIES})
-    endif()
-
-    # Check and create GTest::gmock if not available
-    if(NOT TARGET GTest::gmock)
-        add_library(GTest::gmock INTERFACE IMPORTED)
-        set_property(TARGET GTest::gmock PROPERTY
-            INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIRS})
-        set_property(TARGET GTest::gmock PROPERTY
-            INTERFACE_LINK_LIBRARIES ${GMOCK_BOTH_LIBRARIES})
-    endif()
-
     add_subdirectory(integration_tests)
     add_subdirectory(unit_tests)
     add_subdirectory(system_tests)

diff --git a/src/integration_tests/CMakeLists.txt b/src/integration_tests/CMakeLists.txt
@@ -67,6 +67,9 @@ set_target_properties(integration_tests_runner
     PROPERTIES COMPILE_FLAGS ${warnings}
 )
 
+hunter_add_package(GTest)
+find_package(GTest REQUIRED)
+
 target_link_libraries(integration_tests_runner
     PRIVATE
     mavsdk

diff --git a/src/system_tests/CMakeLists.txt b/src/system_tests/CMakeLists.txt
@@ -26,6 +26,9 @@ target_include_directories(system_tests_runner
     ${PROJECT_SOURCE_DIR}/mavsdk/core
 )
 
+hunter_add_package(GTest)
+find_package(GTest REQUIRED)
+
 target_link_libraries(system_tests_runner
     PRIVATE
     mavsdk

diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt
@@ -10,6 +10,8 @@ set_target_properties(unit_tests_runner
     PROPERTIES COMPILE_FLAGS ${warnings}
 )
 
+find_package(GTest)
+
 target_link_libraries(unit_tests_runner
     mavsdk
     CURL::libcurl