Fix for gtest build with Clang libc++

2015-08-14 13:59:05 +02:00 · 2015-08-14 13:59:05 +02:00 · a0f0a53d59
parent bde0261fe7
commit a0f0a53d59
2 changed files with 4 additions and 0 deletions
--- 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)
--- 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})