diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-09 09:41:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-09 09:41:02 -0500 |
| commit | 55fca1937d82bd67a910db142a5aa41311f09f1b (patch) | |
| tree | 9fe63c533461d3bf9f25e855b50586bd9fc6ed6c /googlemock | |
| parent | c5cba7d17a928c18c61feb71db0d6a21ea1dc9db (diff) | |
| parent | 59202300f1a774068608caff0351cc084fe79e7c (diff) | |
| download | googletest-55fca1937d82bd67a910db142a5aa41311f09f1b.tar.gz googletest-55fca1937d82bd67a910db142a5aa41311f09f1b.tar.bz2 googletest-55fca1937d82bd67a910db142a5aa41311f09f1b.zip | |
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | googlemock/test/BUILD.bazel | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 724fdd5f..ead51bf3 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -74,6 +74,8 @@ include_directories("${gmock_SOURCE_DIR}/include" # <= VS 2010 <= 10 <= 1600 Use Google Tests's own tuple. # VS 2012 11 1700 std::tr1::tuple + _VARIADIC_MAX=10 # VS 2013 12 1800 std::tr1::tuple +# VS 2015 14 1900 std::tuple +# VS 2017 15 >= 1910 std::tuple if (MSVC AND MSVC_VERSION EQUAL 1700) add_definitions(/D _VARIADIC_MAX=10) endif() @@ -101,8 +103,8 @@ cxx_library(gmock_main # 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(gmock INTERFACE "${gmock_SOURCE_DIR}/include") - target_include_directories(gmock_main INTERFACE "${gmock_SOURCE_DIR}/include") + target_include_directories(gmock SYSTEM INTERFACE "${gmock_SOURCE_DIR}/include") + target_include_directories(gmock_main SYSTEM INTERFACE "${gmock_SOURCE_DIR}/include") endif() ######################################################################## diff --git a/googlemock/test/BUILD.bazel b/googlemock/test/BUILD.bazel index 6e67f187..9f1a64d8 100644 --- a/googlemock/test/BUILD.bazel +++ b/googlemock/test/BUILD.bazel @@ -32,6 +32,8 @@ # # Bazel Build for Google C++ Testing Framework(Google Test)-googlemock +licenses(["notice"]) + """ gmock own tests """ cc_test( |