From 3cba4f77eee55db199b680173705bfb13901990a Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Mon, 3 Feb 2020 09:13:22 +1100 Subject: [PATCH 1/2] Mark gmock as system includes --- FindGoogletest.cmake | 1 + GenericFindDependency.cmake | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/FindGoogletest.cmake b/FindGoogletest.cmake index 01668e8..1df6c39 100644 --- a/FindGoogletest.cmake +++ b/FindGoogletest.cmake @@ -4,3 +4,4 @@ GenericFindDependency( SOURCE_DIR "googletest" SYSTEM_INCLUDES ) +mark_target_as_system_includes(gmock) diff --git a/GenericFindDependency.cmake b/GenericFindDependency.cmake index 3fda8c7..4b8c1e8 100644 --- a/GenericFindDependency.cmake +++ b/GenericFindDependency.cmake @@ -272,12 +272,12 @@ endmacro() # # Should only be called from GenericFindDependency # -function(mark_target_as_system_includes TARGET) - get_target_property(directories ${x_TARGET} INTERFACE_INCLUDE_DIRECTORIES) +function(mark_target_as_system_includes TGT) + get_target_property(directories ${TGT} INTERFACE_INCLUDE_DIRECTORIES) if(directories) - message(STATUS "Marking ${x_TARGET} include directories as system") - set_target_properties(${x_TARGET} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "") - target_include_directories(${x_TARGET} SYSTEM INTERFACE "${directories}") + message(STATUS "Marking ${TGT} include directories as system") + set_target_properties(${TGT} PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "") + target_include_directories(${TGT} SYSTEM INTERFACE "${directories}") endif() endfunction() From 4e0f6013bdee24f29ef0d3f592adee2ec5288934 Mon Sep 17 00:00:00 2001 From: Matt Woodward Date: Mon, 3 Feb 2020 09:49:16 +1100 Subject: [PATCH 2/2] Add gmock-global --- FindGmockGlobal.cmake | 6 ++++++ SwiftCmakeOptions.cmake | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 FindGmockGlobal.cmake diff --git a/FindGmockGlobal.cmake b/FindGmockGlobal.cmake new file mode 100644 index 0000000..f88f1eb --- /dev/null +++ b/FindGmockGlobal.cmake @@ -0,0 +1,6 @@ +include("GenericFindDependency") +GenericFindDependency( + TARGET gmock-global + SOURCE_DIR "gmock-global" + SYSTEM_INCLUDES + ) diff --git a/SwiftCmakeOptions.cmake b/SwiftCmakeOptions.cmake index d7e23a6..b52086b 100644 --- a/SwiftCmakeOptions.cmake +++ b/SwiftCmakeOptions.cmake @@ -139,6 +139,8 @@ function(verify_test_dependencies) set(found TRUE) elseif(${P} STREQUAL "Benchmark" AND TARGET benchmark) set(found TRUE) + elseif(${P} STREQUAL "GmockGlobal" AND TARGET gmock-global) + set(found TRUE) endif() if(NOT found) message(WARNING "Disable tests because dependency ${P} was not found")