Fixed CMake build compile error; don't compile GMock with cxx11 flag. Right now if you try to compile GMock a non-Windows platform using the CMake build system, it will error out. The problem seems to be the CXX11 flag.
This commit will solve this problem by removing that flag. Review: https://reviews.apache.org/r/37370 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cc0b6ea8 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cc0b6ea8 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cc0b6ea8 Branch: refs/heads/master Commit: cc0b6ea87f2ca9bb2d51d18f189b8d1bccc1c7a1 Parents: 588b94e Author: Alex Clemmer <[email protected]> Authored: Thu Sep 10 12:08:03 2015 -0700 Committer: Joris Van Remoortere <[email protected]> Committed: Thu Sep 10 17:15:29 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/cc0b6ea8/3rdparty/libprocess/3rdparty/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt index c31191f..d13ba66 100644 --- a/3rdparty/libprocess/3rdparty/CMakeLists.txt +++ b/3rdparty/libprocess/3rdparty/CMakeLists.txt @@ -211,7 +211,7 @@ endif (REBUNDLED) if (APPLE) # GTEST on OSX needs its own tr1 tuple. - set(GMOCK_BUILD_CMD make CPPFLAGS=-DGTEST_USE_OWN_TR1_TUPLE -DGTEST_LANG_CXX11) + set(GMOCK_BUILD_CMD make CPPFLAGS=-DGTEST_USE_OWN_TR1_TUPLE) set(GMOCK_CONFIG_CMD ${GMOCK_ROOT}/configure --prefix=${GMOCK_ROOT}-lib/lib) elseif (NOT WIN32) set(GMOCK_CONFIG_CMD ${GMOCK_ROOT}/configure --prefix=${GMOCK_ROOT}-lib/lib)
