Update googletest integration (refs #41)

Author: scheibel

cmake/Findgoogletest.cmake

@@ -0,0 +1,42 @@
+
+# googletest_FOUND
+# Target googletest::googletest
+
+include(FindPackageHandleStandardArgs)
+
+find_package(PkgConfig)
+
+# enable MSVC syntax if required
+if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
+    set(PKG_CONFIG_ARGN ${PKG_CONFIG_ARGN} "--msvc-syntax")
+endif()
+
+pkg_search_module(GMOCK QUIET gmock_main)
+
+find_package_handle_standard_args(googletest REQUIRED_VARS GMOCK_CFLAGS GMOCK_LDFLAGS)
+mark_as_advanced(GMOCK_CFLAGS GMOCK_LDFLAGS)
+
+if (googletest_FOUND)
+    # the linker flags aren't correct for use with target_link_libraries
+    # example: /libpath:[path]/lib.lib;gmock_main.lib;gmock.lib;gtest.lib
+    # note that the path arg falsely includes a .lib suffix
+    # additionally, cmake expects linker flags to start with -
+    # thus, the leading / has to be replaced
+    # example result: -libpath:[path]/lib;gmock_main.lib;gmock.lib;gtest.lib
+    if("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
+        string(REGEX REPLACE "(\\/)(libpath[^;]*)(\\.lib)" "-\\2" GMOCK_LDFLAGS "${GMOCK_LDFLAGS}")
+    endif()
+    
+    # Create interface library to link against gmock
+    add_library(googletest::googletest INTERFACE IMPORTED)
+
+    target_link_libraries(googletest::googletest
+        INTERFACE
+        ${GMOCK_LDFLAGS}
+    )
+
+    target_compile_options(googletest::googletest
+        INTERFACE
+        ${GMOCK_CFLAGS}
+    )
+endif ()

source/tests/CMakeLists.txt

@@ -17,7 +17,6 @@ set_policy(CMP0028 NEW) # ENABLE  CMP0028: Double colon in target name means ALI
 set_policy(CMP0054 NEW) # ENABLE  CMP0054: Only interpret if() arguments as variables or keywords when unquoted.
 set_policy(CMP0042 NEW) # ENABLE  CMP0042: MACOSX_RPATH is enabled by default.
 set_policy(CMP0063 NEW) # ENABLE  CMP0063: Honor visibility properties for all target types.
-set_policy(CMP0037 OLD) # DISABLE CMP0037: Target names should not be reserved and should match a validity pattern.
 
 # Compiler settings and options
 
@@ -41,40 +40,32 @@ function(add_test_without_ctest target)
 
     add_dependencies(test ${target})
     add_custom_command(TARGET test POST_BUILD 
-        COMMAND $<TARGET_FILE:${target}> --gtest_output=xml:gtests-${target}.xml)
+        COMMAND $<TARGET_FILE:${target}> --gtest_output=xml:gtests-${target}.xml
+    )
 endfunction()
 
-# Build gmock
-set(gmock_build_tests           OFF CACHE BOOL "")
-set(gtest_build_samples         OFF CACHE BOOL "")
-set(gtest_build_tests           OFF CACHE BOOL "")
-set(gtest_disable_pthreads      OFF CACHE BOOL "")
-set(gtest_force_shared_crt      ON  CACHE BOOL "")
-set(gtest_hide_internal_symbols OFF CACHE BOOL "")
+find_package(googletest QUIET)
 
-add_subdirectory(googletest)
-
-# Create interface library to link against gmock
-add_library(gmock-dev INTERFACE)
-
-target_include_directories(gmock-dev
-    SYSTEM INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}/googletest/googletest/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/googletest/googlemock/include
-)
-
-target_link_libraries(gmock-dev
-    INTERFACE
-    gmock
-)
+if (NOT TARGET googletest::googletest)
+    message(STATUS "Tests skipped: googletest not found")
+    return()
+endif ()
 
 
 # 
 # Target 'test'
 # 
 
-add_custom_target(test)
-set_target_properties(test PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+if (${CMAKE_VERSION} VERSION_LESS "3.11")
+    set_policy(CMP0037 OLD) # DISABLE CMP0037: Target names should be reserved and should match a validity pattern.
+    add_custom_target(test)
+    set_target_properties(test PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+else ()
+    if (NOT TARGET test)
+        add_custom_target(test)
+        set_target_properties(test PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD 1)
+    endif()
+endif ()
 
 
 # 

source/tests/cppfs-test/CMakeLists.txt

@@ -68,7 +68,7 @@ target_link_libraries(${target}
     PRIVATE
     ${DEFAULT_LIBRARIES}
     ${META_PROJECT_NAME}::cppfs
-    gmock-dev
+    googletest::googletest
 )