Skip to content

Mark gmock as system, add gmock-global #43

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 2, 2020
Merged

Mark gmock as system, add gmock-global #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cba4f7
Mark gmock as system includes
Feb 2, 2020
4e0f601
Add gmock-global
Feb 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions FindGmockGlobal.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
include("GenericFindDependency")
GenericFindDependency(
TARGET gmock-global
SOURCE_DIR "gmock-global"
SYSTEM_INCLUDES
)
1 change: 1 addition & 0 deletions FindGoogletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ GenericFindDependency(
SOURCE_DIR "googletest"
SYSTEM_INCLUDES
)
mark_target_as_system_includes(gmock)
10 changes: 5 additions & 5 deletions GenericFindDependency.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
2 changes: 2 additions & 0 deletions SwiftCmakeOptions.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down