From b697a7d6f9e494c805e7d89d6b8170d54271928b Mon Sep 17 00:00:00 2001 From: Victor Zverovich Date: Fri, 15 Nov 2013 14:21:55 -0800 Subject: [PATCH] Only use GTest's own tuple on clang. --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 047731bb..271cdc39 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,9 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/gtest/CMakeLists.txt) gtest_force_shared_crt "Use shared (DLL) run-time lib even when Google Test is built as static lib." ON) - add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1) + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1) + endif () add_subdirectory(gtest) include_directories(gtest/include) link_directories(${CMAKE_CURRENT_BINARY_DIR}/gtest)