Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
f46bd00e
Commit
f46bd00e
authored
Nov 27, 2017
by
Sam Lunt
Committed by
Sam Lunt
Nov 27, 2017
Browse files
make includes system
parent
d175c8bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
googlemock/CMakeLists.txt
googlemock/CMakeLists.txt
+2
-2
googletest/CMakeLists.txt
googletest/CMakeLists.txt
+2
-2
No files found.
googlemock/CMakeLists.txt
View file @
f46bd00e
...
@@ -101,8 +101,8 @@ cxx_library(gmock_main
...
@@ -101,8 +101,8 @@ cxx_library(gmock_main
# to the targets for when we are part of a parent build (ie being pulled
# to the targets for when we are part of a parent build (ie being pulled
# in via add_subdirectory() rather than being a standalone build).
# in via add_subdirectory() rather than being a standalone build).
if
(
DEFINED CMAKE_VERSION AND NOT
"
${
CMAKE_VERSION
}
"
VERSION_LESS
"2.8.11"
)
if
(
DEFINED CMAKE_VERSION AND NOT
"
${
CMAKE_VERSION
}
"
VERSION_LESS
"2.8.11"
)
target_include_directories
(
gmock INTERFACE
"
${
gmock_SOURCE_DIR
}
/include"
)
target_include_directories
(
gmock
SYSTEM
INTERFACE
"
${
gmock_SOURCE_DIR
}
/include"
)
target_include_directories
(
gmock_main INTERFACE
"
${
gmock_SOURCE_DIR
}
/include"
)
target_include_directories
(
gmock_main
SYSTEM
INTERFACE
"
${
gmock_SOURCE_DIR
}
/include"
)
endif
()
endif
()
########################################################################
########################################################################
...
...
googletest/CMakeLists.txt
View file @
f46bd00e
...
@@ -103,8 +103,8 @@ target_link_libraries(gtest_main gtest)
...
@@ -103,8 +103,8 @@ target_link_libraries(gtest_main gtest)
# to the targets for when we are part of a parent build (ie being pulled
# to the targets for when we are part of a parent build (ie being pulled
# in via add_subdirectory() rather than being a standalone build).
# in via add_subdirectory() rather than being a standalone build).
if
(
DEFINED CMAKE_VERSION AND NOT
"
${
CMAKE_VERSION
}
"
VERSION_LESS
"2.8.11"
)
if
(
DEFINED CMAKE_VERSION AND NOT
"
${
CMAKE_VERSION
}
"
VERSION_LESS
"2.8.11"
)
target_include_directories
(
gtest INTERFACE
"
${
gtest_SOURCE_DIR
}
/include"
)
target_include_directories
(
gtest
SYSTEM
INTERFACE
"
${
gtest_SOURCE_DIR
}
/include"
)
target_include_directories
(
gtest_main INTERFACE
"
${
gtest_SOURCE_DIR
}
/include"
)
target_include_directories
(
gtest_main
SYSTEM
INTERFACE
"
${
gtest_SOURCE_DIR
}
/include"
)
endif
()
endif
()
########################################################################
########################################################################
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment