From 4890dbd3fd9f4e19635101aa5b280a2826efb1d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Bylica?= Date: Fri, 13 Sep 2019 11:01:47 +0200 Subject: [PATCH] cmake: Disable support for std::tr1::tuple in GTest --- cmake/Hunter/config.cmake | 4 +++- test/CMakeLists.txt | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index f6a06db..fc40b38 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -4,10 +4,12 @@ # Local Hunter configuration. +set(gtest_cxx_flags "${CMAKE_CXX_FLAGS_INIT} -DGTEST_HAS_TR1_TUPLE=0") + hunter_config( GTest VERSION 1.8.1 URL https://github.com/google/googletest/archive/release-1.8.1.tar.gz SHA1 152b849610d91a9dfa1401293f43230c2e0c33f8 - CMAKE_ARGS BUILD_GMOCK=OFF gtest_force_shared_crt=ON + CMAKE_ARGS BUILD_GMOCK=OFF gtest_force_shared_crt=ON CMAKE_CXX_FLAGS=${gtest_cxx_flags} ) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index fce1ffd..e5e0a62 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -5,6 +5,9 @@ hunter_add_package(GTest) find_package(GTest CONFIG REQUIRED) +# Disable support for std::tr1::tuple in GTest. This causes problems in Visual Studio 2015. +set_target_properties(GTest::gtest PROPERTIES INTERFACE_COMPILE_DEFINITIONS GTEST_HAS_TR1_TUPLE=0) + if(NOT CMAKE_CXX_STANDARD) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_EXTENSIONS OFF)