[Lldb-commits] [lldb] cc68c12 - [lldb/TestingSupport] Manually disable GTEST_HAS_TR1_TUPLE

[Tatyana Krasnukha via lldb-commits]

Author: Tatyana Krasnukha
Date: 2020-08-05T11:59:46+03:00
New Revision: cc68c122cd00f99037b8ff7e645e2b387d56da8b

URL: https://github.com/llvm/llvm-project/commit/cc68c122cd00f99037b8ff7e645e2b387d56da8b
DIFF: https://github.com/llvm/llvm-project/commit/cc68c122cd00f99037b8ff7e645e2b387d56da8b.diff

LOG: [lldb/TestingSupport] Manually disable GTEST_HAS_TR1_TUPLE

Gtest 1.8.0 uses tr1::tuple which is deprecated on MSVC. We have to force it off
to avoid the compiler warnings, which will become errors after switching on C++17
(https://devblogs.microsoft.com/cppblog/c17-feature-removals-and-deprecations).

Added: 
    

Modified: 
    lldb/unittests/TestingSupport/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/lldb/unittests/TestingSupport/CMakeLists.txt b/lldb/unittests/TestingSupport/CMakeLists.txt
index 3b5662a16e33..5322362ed3a2 100644
--- a/lldb/unittests/TestingSupport/CMakeLists.txt
+++ b/lldb/unittests/TestingSupport/CMakeLists.txt
@@ -1,3 +1,6 @@
+# Gtest 1.8.0 uses tr1/tuple which is deprecated on MSVC, so we force it off.
+add_definitions(-DGTEST_HAS_TR1_TUPLE=0)
+
 set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL ON)
 add_lldb_library(lldbUtilityHelpers
   MockTildeExpressionResolver.cpp