Update gmock to 1.7.0. Review: https://reviews.apache.org/r/36837
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a8970ce7 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a8970ce7 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a8970ce7 Branch: refs/heads/master Commit: a8970ce78f1abbee3dd4de282d54ced38d0e5fa1 Parents: 326df48 Author: haosdent huang <[email protected]> Authored: Fri Aug 7 02:24:19 2015 -0700 Committer: Michael Park <[email protected]> Committed: Fri Aug 7 02:24:19 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/CMakeLists.txt | 4 +--- 3rdparty/libprocess/3rdparty/gmock-1.6.0.tar.gz | Bin 1798225 -> 0 bytes 3rdparty/libprocess/3rdparty/gmock-1.7.0.tar.gz | Bin 0 -> 1907242 bytes 3rdparty/libprocess/3rdparty/versions.am | 2 +- .../libprocess/cmake/ProcessTestsConfigure.cmake | 6 ++---- 3rdparty/libprocess/configure.ac | 4 +--- 6 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/a8970ce7/3rdparty/libprocess/3rdparty/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt index 711809e..997cc0d 100644 --- a/3rdparty/libprocess/3rdparty/CMakeLists.txt +++ b/3rdparty/libprocess/3rdparty/CMakeLists.txt @@ -163,9 +163,7 @@ endif (REBUNDLED) if (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. - set(GMOCK_BUILD_CMD make CPPFLAGS=-DGTEST_USE_OWN_TR1_TUPLE) + set(GMOCK_BUILD_CMD make CPPFLAGS=-DGTEST_USE_OWN_TR1_TUPLE -DGTEST_LANG_CXX11) 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) http://git-wip-us.apache.org/repos/asf/mesos/blob/a8970ce7/3rdparty/libprocess/3rdparty/gmock-1.6.0.tar.gz ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/gmock-1.6.0.tar.gz b/3rdparty/libprocess/3rdparty/gmock-1.6.0.tar.gz deleted file mode 100644 index d45d989..0000000 Binary files a/3rdparty/libprocess/3rdparty/gmock-1.6.0.tar.gz and /dev/null differ http://git-wip-us.apache.org/repos/asf/mesos/blob/a8970ce7/3rdparty/libprocess/3rdparty/gmock-1.7.0.tar.gz ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/gmock-1.7.0.tar.gz b/3rdparty/libprocess/3rdparty/gmock-1.7.0.tar.gz new file mode 100644 index 0000000..09f5ea3 Binary files /dev/null and b/3rdparty/libprocess/3rdparty/gmock-1.7.0.tar.gz differ http://git-wip-us.apache.org/repos/asf/mesos/blob/a8970ce7/3rdparty/libprocess/3rdparty/versions.am ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/versions.am b/3rdparty/libprocess/3rdparty/versions.am index 9772753..f44c715 100644 --- a/3rdparty/libprocess/3rdparty/versions.am +++ b/3rdparty/libprocess/3rdparty/versions.am @@ -4,7 +4,7 @@ BOOST_VERSION = 1.53.0 GLOG_VERSION = 0.3.3 -GMOCK_VERSION = 1.6.0 +GMOCK_VERSION = 1.7.0 GPERFTOOLS_VERSION = 2.0 LIBEV_VERSION = 4.15 PROTOBUF_VERSION = 2.5.0 http://git-wip-us.apache.org/repos/asf/mesos/blob/a8970ce7/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake index 3c1bb0b..9e4dcb8 100644 --- a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake +++ b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake @@ -33,7 +33,7 @@ # DIRECTORY STRUCTURE FOR THIRD-PARTY LIBS REQUIRED FOR TEST INFRASTRUCTURE. ############################################################################ -EXTERNAL("gmock" "1.6.0" "${PROCESS_3RD_BIN}") +EXTERNAL("gmock" "1.7.0" "${PROCESS_3RD_BIN}") EXTERNAL("protobuf" "2.5.0" "${PROCESS_3RD_BIN}") set(GTEST_SRC ${GMOCK_ROOT}/gtest) @@ -45,9 +45,7 @@ set(PROTOBUF_LIB ${PROTOBUF_ROOT}-lib/lib) ######################### if (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 (APPLE) # DEFINE PROCESS TEST LIBRARY DEPENDENCIES. Tells the process library build http://git-wip-us.apache.org/repos/asf/mesos/blob/a8970ce7/3rdparty/libprocess/configure.ac ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac index 40f344c..43c0263 100644 --- a/3rdparty/libprocess/configure.ac +++ b/3rdparty/libprocess/configure.ac @@ -823,9 +823,7 @@ case "$host_os" in fi # 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. - CXXFLAGS="$CXXFLAGS -DGTEST_USE_OWN_TR1_TUPLE=1" + CXXFLAGS="$CXXFLAGS -DGTEST_USE_OWN_TR1_TUPLE=1 -DGTEST_LANG_CXX11" ;; esac
