diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-08 11:55:08 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 11:55:08 -0500 |
| commit | 8f90d46c8cdd743759821a1c987a70e826d58cef (patch) | |
| tree | e2870f8763c02d884e3a29b3a2284c38413b5d1f /googlemock | |
| parent | 4d50715c2bf9c727573a397cfb02bd551d4aa3b0 (diff) | |
| parent | 4d1f930af878dbd929f33088c375175896f4e365 (diff) | |
| download | googletest-8f90d46c8cdd743759821a1c987a70e826d58cef.tar.gz googletest-8f90d46c8cdd743759821a1c987a70e826d58cef.tar.bz2 googletest-8f90d46c8cdd743759821a1c987a70e826d58cef.zip | |
Merge branch 'master' into fix-argc
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() |