gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license

Browse Source
This commit is contained in:
Carlos O'Ryan
2017-12-11 19:34:19 -05:00
parent 23a014ab57 cb95f316c8
commit f34cbefe50
10 changed files with 313 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
googletest/CMakeLists.txt
View File

@@ -105,8 +105,8 @@ target_link_libraries(gtest_main gtest)
# 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).
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_main INTERFACE "${gtest_SOURCE_DIR}/include")
target_include_directories(gtest SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include")
target_include_directories(gtest_main SYSTEM INTERFACE "${gtest_SOURCE_DIR}/include")
endif()
########################################################################