diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2017-12-08 11:56:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-08 11:56:41 -0500 |
| commit | a30e15b144b7669e8eb0801b67708c5137677e9a (patch) | |
| tree | 6f584990c83ce59fc2dcf6fbd297f01b17245af1 /googlemock | |
| parent | aea8580ecf448bc9d783181996139cae60ce44c9 (diff) | |
| parent | 4d1f930af878dbd929f33088c375175896f4e365 (diff) | |
| download | googletest-a30e15b144b7669e8eb0801b67708c5137677e9a.tar.gz googletest-a30e15b144b7669e8eb0801b67708c5137677e9a.tar.bz2 googletest-a30e15b144b7669e8eb0801b67708c5137677e9a.zip | |
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule
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() |