diff options
| author | Abseil Team <absl-team@google.com> | 2018-10-09 14:50:26 -0400 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-10-09 16:25:58 -0400 |
| commit | 7d3b73c85a42811309eac26e5cbe054c40b64785 (patch) | |
| tree | 589142a210a7bf1ccfd51180586a35c4a6f73b68 /googlemock/CMakeLists.txt | |
| parent | 5434989dbd8a15f14f33cbeb9d94801247031c95 (diff) | |
| download | googletest-7d3b73c85a42811309eac26e5cbe054c40b64785.tar.gz googletest-7d3b73c85a42811309eac26e5cbe054c40b64785.tar.bz2 googletest-7d3b73c85a42811309eac26e5cbe054c40b64785.zip | |
Unconditionally use std::tuple.
Remove all mention of TR1 tuple and our own implementation of tuple.
PiperOrigin-RevId: 216395043
Diffstat (limited to 'googlemock/CMakeLists.txt')
| -rw-r--r-- | googlemock/CMakeLists.txt | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt index 78762b0c..1fd758e7 100644 --- a/googlemock/CMakeLists.txt +++ b/googlemock/CMakeLists.txt @@ -75,18 +75,6 @@ set(gmock_build_include_dirs "${gtest_SOURCE_DIR}") include_directories(${gmock_build_include_dirs}) -# Summary of tuple support for Microsoft Visual Studio: -# Compiler version(MS) version(cmake) Support -# ---------- ----------- -------------- ----------------------------- -# <= 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() - ######################################################################## # # Defines the gmock & gmock_main libraries. User tests should link @@ -199,25 +187,12 @@ $env:Path = \"$project_bin;$env:Path\" cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) - if (MSVC_VERSION LESS 1600) # 1600 is Visual Studio 2010. - # Visual Studio 2010, 2012, and 2013 define symbols in std::tr1 that - # conflict with our own definitions. Therefore using our own tuple does not - # work on those compilers. - cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" - "${gtest_dir}/src/gtest-all.cc" src/gmock-all.cc src/gmock_main.cc) - - cxx_test_with_flags(gmock_use_own_tuple_test "${cxx_use_own_tuple}" - gmock_main_use_own_tuple test/gmock-spec-builders_test.cc) - endif() else() cxx_library(gmock_main_no_exception "${cxx_no_exception}" src/gmock_main.cc) target_link_libraries(gmock_main_no_exception PUBLIC gmock) cxx_library(gmock_main_no_rtti "${cxx_no_rtti}" src/gmock_main.cc) target_link_libraries(gmock_main_no_rtti PUBLIC gmock) - - cxx_library(gmock_main_use_own_tuple "${cxx_use_own_tuple}" src/gmock_main.cc) - target_link_libraries(gmock_main_use_own_tuple PUBLIC gmock) endif() cxx_test_with_flags(gmock-more-actions_no_exception_test "${cxx_no_exception}" gmock_main_no_exception test/gmock-more-actions_test.cc) |