Added back GTEST_USE_OWN_TR1_TUPLE for Mesos. Review: https://reviews.apache.org/r/18867
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6e7a2912 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6e7a2912 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6e7a2912 Branch: refs/heads/master Commit: 6e7a2912470c16b309a178a02d1f43fc835b19f0 Parents: c3cfdd5 Author: Dominic Hamon <[email protected]> Authored: Thu Mar 6 17:36:38 2014 -0800 Committer: Benjamin Hindman <[email protected]> Committed: Thu Mar 6 17:36:38 2014 -0800 ---------------------------------------------------------------------- configure.ac | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/6e7a2912/configure.ac ---------------------------------------------------------------------- diff --git a/configure.ac b/configure.ac index 91ddf57..390f11b 100644 --- a/configure.ac +++ b/configure.ac @@ -624,6 +624,11 @@ if test "x$with_cxx11" = "xyes"; then ;; esac + # Force gtest to use it's own tuple implementation since 'tr1/tuple' + # might not exist (for example, if building with clang). + # TODO(dhamon): Upgrade gmock to 1.7 and pass GTEST_LANG_CXX11. + CXXFLAGS="-DGTEST_USE_OWN_TR1_TUPLE=1 $CXXFLAGS" + # Also pass the flags to 3rdparty libraries. CONFIGURE_ARGS="$CONFIGURE_ARGS CXXFLAGS='$CXXFLAGS'" fi
