diff options
| author | bryanzim <BryanZim@bazinnovations.com> | 2017-12-08 16:31:31 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 16:31:31 (GMT) |
| commit | 4aae1600d036c45ba7c128f202350fa7a9da7cae (patch) | |
| tree | b9bc473865ca5e238fd7d3fdf12573f396e04ada /googlemock | |
| parent | 11d21b7c2ab56aa4ec80bbe31d8b08b6afa91003 (diff) | |
| parent | 4d1f930af878dbd929f33088c375175896f4e365 (diff) | |
| download | googletest-4aae1600d036c45ba7c128f202350fa7a9da7cae.zip googletest-4aae1600d036c45ba7c128f202350fa7a9da7cae.tar.gz googletest-4aae1600d036c45ba7c128f202350fa7a9da7cae.tar.bz2 | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 2051f15..58ffd44 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -75,7 +75,8 @@ include_directories("${gmock_SOURCE_DIR}/include" # 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 +# VS 2017 15 >= 1910 std::tuple + if (MSVC AND MSVC_VERSION EQUAL 1700) add_definitions(/D _VARIADIC_MAX=10) endif() |