From a0f0a53d595111632f9102f40f6b77e97d5bbd97 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Fri, 14 Aug 2015 13:59:05 +0200 Subject: [PATCH] Fix for gtest build with Clang libc++ --- lib/gtest/CMakeLists.txt | 2 ++ test/unit/CMakeLists.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/lib/gtest/CMakeLists.txt b/lib/gtest/CMakeLists.txt index 316ea141..76c51ba9 100644 --- a/lib/gtest/CMakeLists.txt +++ b/lib/gtest/CMakeLists.txt @@ -2,5 +2,7 @@ cmake_minimum_required(VERSION 2.8) include_directories(. include) +add_definitions(-DGTEST_HAS_TR1_TUPLE=0) + # gtest-all.cc includes all other sources add_library(gtest STATIC src/gtest-all.cc) diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index b38e7b28..f12c3a22 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -51,6 +51,8 @@ file(COPY ${TEST_FILES} DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) # Targets +add_definitions(-DGTEST_HAS_TR1_TUPLE=0) + add_executable(colobot_ut ${UT_SOURCES}) target_link_libraries(colobot_ut ${LIBS})