iox-eclipse-iceoryx#1516 Use Googletest detection in all components

Signed-off-by: Dietrich Krönke <[email protected]>
ApexAI · Aug 3, 2022 · 0fb3b51 · 0fb3b51
1 parent d7bbc05
commit 0fb3b51
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 34 deletions.
diff --git a/doc/aspice_swe3_4/example/iceoryx_component/CMakeLists.txt b/doc/aspice_swe3_4/example/iceoryx_component/CMakeLists.txt
@@ -42,17 +42,16 @@ iox_add_library(
 ########## test ##########
 #
 
-if(BUILD_TEST AND NOT GTest_FOUND)
-    find_package(GTest CONFIG REQUIRED)
-endif(BUILD_TEST AND NOT GTest_FOUND)
+if(BUILD_TEST)
+  detect_gtest_package()
 
-set(PROJECT_PREFIX "iceoryx_component")
+  set(PROJECT_PREFIX "iceoryx_component")
 
-file(GLOB_RECURSE MODULETESTS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/test/moduletests/*.cpp")
+  file(GLOB_RECURSE MODULETESTS_SRC
+       "${CMAKE_CURRENT_SOURCE_DIR}/test/moduletests/*.cpp")
 
-set(TEST_LINK_LIBS
-    GTest::gtest
-    GTest::gmock
+  set(TEST_LINK_LIBS
+    ${IOX_GTEST_LIBS}
     iceoryx_component::iceoryx_component
 )
 
@@ -64,3 +63,4 @@ iox_add_executable(
     LIBS                    ${TEST_LINK_LIBS}
     LIBS_LINUX              dl
 )
+endif()
diff --git a/iceoryx_binding_c/CMakeLists.txt b/iceoryx_binding_c/CMakeLists.txt
@@ -76,5 +76,6 @@ iox_add_library(
 ########## build test executables ##########
 #
 if(BUILD_TEST)
+    detect_gtest_package()
     add_subdirectory(test)
 endif()
diff --git a/iceoryx_binding_c/test/CMakeLists.txt b/iceoryx_binding_c/test/CMakeLists.txt
@@ -19,7 +19,6 @@ project(test_binding_c VERSION 0)
 
 find_package(iceoryx_hoofs_testing REQUIRED)
 find_package(iceoryx_posh_testing REQUIRED)
-find_package(GTest CONFIG REQUIRED)
 
 set(PROJECT_PREFIX "binding_c")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_PREFIX}/test)
@@ -28,8 +27,7 @@ file(GLOB_RECURSE MODULETESTS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/moduletests/*.cpp
 
 set(TEST_LINK_LIBS
     ${CODE_COVERAGE_LIBS}
-    GTest::gtest
-    GTest::gmock
+    ${IOX_GTEST_LIBS}
     iceoryx_binding_c::iceoryx_binding_c
     iceoryx_hoofs::iceoryx_hoofs
     iceoryx_hoofs_testing::iceoryx_hoofs_testing

diff --git a/iceoryx_dds/CMakeLists.txt b/iceoryx_dds/CMakeLists.txt
@@ -120,5 +120,6 @@ iox_add_executable(
 ########## build test executables ##########
 #
 if(BUILD_TEST)
+    detect_gtest_package()
     add_subdirectory(test)
 endif()
diff --git a/iceoryx_dds/test/CMakeLists.txt b/iceoryx_dds/test/CMakeLists.txt
@@ -19,7 +19,6 @@ project(test_iox_to_dds VERSION 0)
 
 find_package(iceoryx_hoofs_testing REQUIRED)
 find_package(iceoryx_posh_testing REQUIRED)
-find_package(GTest CONFIG REQUIRED)
 
 set(PROJECT_PREFIX "dds_gateway")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_PREFIX}/test)
@@ -28,8 +27,7 @@ file(GLOB_RECURSE MODULETESTS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/moduletests/*.cpp
 
 set(TEST_LINK_LIBS
     ${CODE_COVERAGE_LIBS}
-    GTest::gtest
-    GTest::gmock
+    ${IOX_GTEST_LIBS}
     iceoryx_hoofs::iceoryx_hoofs
     iceoryx_hoofs_testing::iceoryx_hoofs_testing
     iceoryx_posh::iceoryx_posh

diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt
@@ -93,18 +93,12 @@ iox_add_library(
 ########## hoofs testing ##########
 #
 
-# Finding gtest and adding the subdirectories is split to support the use case of
-# building the testing lib without the tests by providing gtest externally
-if(NOT GTest_FOUND AND BUILD_TEST)
-    find_package(GTest CONFIG REQUIRED)
-endif()
 
-if(GTest_FOUND)
-    message(STATUS "GTest was found, building iceoryx_hoofs_testing enabled.")
+
+if(BUILD_TEST)
+    detect_gtest_package()
     add_subdirectory(testing)
-    if(BUILD_TEST)
-        add_subdirectory(test)
-    endif()
+    add_subdirectory(test)
 endif()
 
 install(

diff --git a/iceoryx_hoofs/test/CMakeLists.txt b/iceoryx_hoofs/test/CMakeLists.txt
@@ -32,8 +32,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_PREFIX}/test)
 
 set(TEST_LINK_LIBS
     ${CODE_COVERAGE_LIBS}
-    GTest::gtest
-    GTest::gmock
+    ${IOX_GTEST_LIBS}
     iceoryx_hoofs::iceoryx_hoofs
     iceoryx_hoofs_testing::iceoryx_hoofs_testing
 )

diff --git a/iceoryx_hoofs/testing/CMakeLists.txt b/iceoryx_hoofs/testing/CMakeLists.txt
@@ -23,16 +23,17 @@
 iox_add_library(
     STATIC
     TARGET                  ${PROJECT_NAME}_testing
+    ${IOX_GTEST_GMOCK_INCLUDE}
     NAMESPACE               iceoryx_hoofs_testing
     PROJECT_PREFIX          ${PREFIX}
-    PUBLIC_LIBS             GTest::gtest
-                            GTest::gmock
+    PUBLIC_LIBS             ${IOX_GTEST_LIBS}
     PRIVATE_LIBS            ${CODE_COVERAGE_LIBS}
                             iceoryx_hoofs
                             ${CMAKE_DL_LIBS}
     PRIVATE_LIBS_LINUX      rt
     BUILD_INTERFACE         ${CMAKE_CURRENT_SOURCE_DIR}/include
     INSTALL_INTERFACE       include/${PREFIX}
+    ${IOX_EXPORT_GTEST_LIBS}
     FILES
         mocks/time_mock.cpp
         mocks/error_handler_mock.cpp

diff --git a/iceoryx_posh/test/CMakeLists.txt b/iceoryx_posh/test/CMakeLists.txt
@@ -24,10 +24,6 @@ find_package(iceoryx_posh_testing REQUIRED)
 
 set(ICEORYX_POSH_TEST_STACK_SIZE 5000000)
 
-if(BUILD_TEST AND NOT GTest_FOUND)
-    find_package(GTest CONFIG REQUIRED)
-endif(BUILD_TEST AND NOT GTest_FOUND)
-
 set(PROJECT_PREFIX "posh")
 
 # Set path for input files in test
@@ -46,8 +42,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${PROJECT_PREFIX}/test)
 
 set(TEST_LINK_LIBS
     ${CODE_COVERAGE_LIBS}
-    GTest::gtest
-    GTest::gmock
+    ${IOX_GTEST_LIBS}
     iceoryx_hoofs::iceoryx_hoofs
     iceoryx_hoofs::iceoryx_platform
     iceoryx_hoofs_testing::iceoryx_hoofs_testing