summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWojciech Mamrak <wmamrak@gmail.com>2017-12-07 17:18:17 (GMT)
committerGitHub <noreply@github.com>2017-12-07 17:18:17 (GMT)
commit3464f76e890a7f130988ffa0196577487d582b76 (patch)
tree779fc25ab2a10bb9f79ab9f95230c8ceb6c46ce3
parent8d9d6bb0a3751ef3a7159aa0c2f1efd769d56075 (diff)
downloadgoogletest-3464f76e890a7f130988ffa0196577487d582b76.zip
googletest-3464f76e890a7f130988ffa0196577487d582b76.tar.gz
googletest-3464f76e890a7f130988ffa0196577487d582b76.tar.bz2
Improved description of VS std::tuple support
-rw-r--r--googlemock/CMakeLists.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
index 724fdd5..c474947 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()