mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-22 02:33:06 +01:00
GTEST_HAS_TR1_TUPLE is gone, stop defining it.
This commit is contained in:
parent
b7cb5e4b0a
commit
b878bba416
@ -11,7 +11,6 @@ config("googletest_config") {
|
||||
# of C++11 on MSVC, so we force it on.
|
||||
defines = [
|
||||
"GTEST_LANG_CXX11",
|
||||
"GTEST_HAS_TR1_TUPLE=0",
|
||||
]
|
||||
if (host_os == "win") {
|
||||
defines += [ "GTEST_OS_WINDOWS" ]
|
||||
|
@ -61,9 +61,6 @@ if(CXX_SUPPORTS_SUGGEST_OVERRIDE_FLAG)
|
||||
set_target_properties(gtest PROPERTIES INTERFACE_COMPILE_OPTIONS "-Wno-suggest-override")
|
||||
endif()
|
||||
|
||||
# Gtest 1.8.0 uses tr1/tuple which is deprecated on MSVC, so we force it off.
|
||||
target_compile_definitions(gtest PUBLIC GTEST_HAS_TR1_TUPLE=0)
|
||||
|
||||
if (NOT LLVM_ENABLE_THREADS)
|
||||
target_compile_definitions(gtest PUBLIC GTEST_HAS_PTHREAD=0)
|
||||
endif ()
|
||||
|
Loading…
Reference in New Issue
Block a user