Repository: mesos Updated Branches: refs/heads/master d24b3ad64 -> 9320f18da
Add GTEST_LANG_CXX11 to StoutTestsConfigure when compile. Review: https://reviews.apache.org/r/37160 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/326df48b Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/326df48b Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/326df48b Branch: refs/heads/master Commit: 326df48b4d390a27e11551de2f404fc03249536b Parents: d24b3ad Author: haosdent huang <[email protected]> Authored: Fri Aug 7 02:24:02 2015 -0700 Committer: Michael Park <[email protected]> Committed: Fri Aug 7 02:24:03 2015 -0700 ---------------------------------------------------------------------- .../libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/326df48b/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake b/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake index d699206..0832529 100644 --- a/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake +++ b/3rdparty/libprocess/3rdparty/stout/cmake/StoutTestsConfigure.cmake @@ -39,9 +39,7 @@ if (WIN32) add_definitions(-D__WINDOWS__) elseif (APPLE) # GTEST on OSX needs its own tr1 tuple. - # TODO(dhamon): Update to gmock 1.7 and pass GTEST_LANG_CXX11 when - # in C++11 mode. - add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1) + add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1 -DGTEST_LANG_CXX11) endif (WIN32) # DEFINE PROCESS LIBRARY DEPENDENCIES. Tells the process library build targets
