diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-08 11:08:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 11:08:54 -0500 |
| commit | efc6abae678ff9142fb36b5f0f35b7a118772061 (patch) | |
| tree | 79bac56e193645c721c8a99336ba996319fa7a20 /googlemock | |
| parent | 4aa05bd4ffb8148787bbcaa8780c9c522eb61b13 (diff) | |
| parent | 887a6c642006aa7475bdedb2b3652feb6a05f417 (diff) | |
| download | googletest-efc6abae678ff9142fb36b5f0f35b7a118772061.tar.gz googletest-efc6abae678ff9142fb36b5f0f35b7a118772061.tar.bz2 googletest-efc6abae678ff9142fb36b5f0f35b7a118772061.zip | |
Merge branch 'master' into fix-travis-build-macOS
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CMakeLists.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 724fdd5f..c474947e 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() |