Use GMock/GTest targets directly instead of via variables

This makes the dependencies more easy to read via visual inspection.
Additionally it also only uses the -main version of the GTest/GMock
library when necessary.

Author: muggenhor

CMakeLists.txt

@@ -98,19 +98,6 @@ if(NOT CUKE_DISABLE_GTEST)
         set(GMOCK_ROOT "${CMAKE_CURRENT_BINARY_DIR}/gmock")
     endif()
     find_package(GMock REQUIRED)
-
-    if(GTEST_FOUND)
-        set(CUKE_GTEST_LIBRARIES
-            GTest::GTest
-            )
-    endif()
-    if(GMOCK_FOUND)
-        set(CUKE_GMOCK_LIBRARIES
-            GTest::GTest
-            GMock::GMock
-            GMock::Main
-            )
-    endif()
 endif()
 
 #

examples/Calc/CMakeLists.txt

@@ -3,14 +3,14 @@ project(Calc)
 add_library(Calc src/Calculator)
 target_include_directories(Calc PUBLIC src)
 
-if(GMOCK_FOUND)
+if(TARGET GTest::GTest)
     add_executable(GTestCalculatorSteps features/step_definitions/GTestCalculatorSteps)
-    target_link_libraries(GTestCalculatorSteps Calc ${CUKE_LIBRARIES} ${CUKE_GTEST_LIBRARIES})
+    target_link_libraries(GTestCalculatorSteps Calc ${CUKE_LIBRARIES} GTest::GTest)
 
     list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_variadic_templates HAS_VARIADIC_TEMPLATES)
     if(HAS_VARIADIC_TEMPLATES GREATER -1)
         add_executable(FuncArgsCalculatorSteps features/step_definitions/FuncArgsCalculatorSteps)
-        target_link_libraries(FuncArgsCalculatorSteps Calc ${CUKE_LIBRARIES} ${CUKE_GTEST_LIBRARIES})
+        target_link_libraries(FuncArgsCalculatorSteps Calc ${CUKE_LIBRARIES} GTest::GTest)
 
         target_compile_features(FuncArgsCalculatorSteps PRIVATE cxx_variadic_templates)
     endif()

examples/CalcQt/CMakeLists.txt

@@ -19,9 +19,9 @@ if(QT_LIBRARIES)
         target_link_libraries(BoostCalculatorQtSteps libcalcqt ${CUKE_LIBRARIES} ${QT_LIBRARIES} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY})
     endif()
 
-    if(GTEST_FOUND)
+    if(TARGET GTest::GTest)
         add_executable(GTestCalculatorQtSteps features/step_definitions/GTestCalculatorQtSteps)
-        target_link_libraries(GTestCalculatorQtSteps libcalcqt ${CUKE_LIBRARIES} ${CUKE_GTEST_LIBRARIES} ${QT_LIBRARIES})
+        target_link_libraries(GTestCalculatorQtSteps libcalcqt ${CUKE_LIBRARIES} GTest::GTest ${QT_LIBRARIES})
     endif()
 
 endif()

examples/FeatureShowcase/CMakeLists.txt

@@ -1,9 +1,9 @@
 project(FeatureShowcase)
 
-if(GMOCK_FOUND)
+if(TARGET GTest::GTest)
     function(add_cucumber_executable)
         add_executable(FeatureShowcaseSteps ${ARGV})
-        target_link_libraries(FeatureShowcaseSteps ${CUKE_LIBRARIES} ${CUKE_GTEST_LIBRARIES})
+        target_link_libraries(FeatureShowcaseSteps ${CUKE_LIBRARIES} GTest::GTest)
         foreach(_arg ${ARGN})
             get_filename_component(OBJECT_PREFIX ${_arg} NAME_WE)
             set_source_files_properties(${_arg} PROPERTIES COMPILE_FLAGS "-DCUKE_OBJECT_PREFIX=${OBJECT_PREFIX}")

src/CMakeLists.txt

@@ -17,7 +17,7 @@ set(CUKE_SOURCES
 
 set(CUKE_DEP_LIBRARIES json_spirit.header)
 
-if(GTEST_FOUND)
+if(TARGET GTest::GTest)
     list(APPEND CUKE_DEP_LIBRARIES GTest::GTest)
     list(APPEND CUKE_SOURCES drivers/GTestDriver.cpp)
 endif()

tests/CMakeLists.txt

@@ -6,12 +6,12 @@ function(cuke_add_driver_test TEST_FILE)
     add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME})
 endfunction()
 
-if(GMOCK_FOUND)
+if(TARGET GMock::Main)
     function(cuke_add_test TEST_FILE)
         get_filename_component(TEST_NAME ${TEST_FILE} NAME)
         message(STATUS "Adding " ${TEST_NAME})
         add_executable(${TEST_NAME} ${TEST_FILE}.cpp)
-        target_link_libraries(${TEST_NAME} cucumber-cpp-nomain ${CUKE_EXTRA_LIBRARIES} ${ARGN} ${CUKE_GMOCK_LIBRARIES})
+        target_link_libraries(${TEST_NAME} cucumber-cpp-nomain ${CUKE_EXTRA_LIBRARIES} ${ARGN} GMock::Main)
         gtest_add_tests(${TEST_NAME} "" ${TEST_FILE}.cpp)
         # Run all tests in executable at once too. This ensures that the used fixtures get tested
         # properly too. Additionally gather the output in jUnit compatible output for CI.
@@ -35,8 +35,10 @@ if(GMOCK_FOUND)
     cuke_add_test(unit/StepManagerTest)
     cuke_add_test(unit/TableTest)
     cuke_add_test(unit/TagTest)
+endif()
 
-    cuke_add_driver_test(integration/drivers/GTestDriverTest ${CUKE_GTEST_LIBRARIES})
+if(TARGET GTest::Main)
+    cuke_add_driver_test(integration/drivers/GTestDriverTest GTest::Main)
 
     list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_variadic_templates HAS_VARIADIC_TEMPLATES)
     if(HAS_VARIADIC_TEMPLATES GREATER -1)