You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2017/06/12 23:16:22 UTC
[16/27] mesos git commit: CMake: Fixed glog `EXTERNAL` setup.
CMake: Fixed glog `EXTERNAL` setup.
This was missed when the versions were reconciled. The `GLOG_VERSION` is
now correct on every platform, so `EXTERNAL("glog"...)` can be reused.
Review: https://reviews.apache.org/r/59788/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/9dba260c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/9dba260c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/9dba260c
Branch: refs/heads/master
Commit: 9dba260c023f9b3a71d216c85f19221a5cfa3611
Parents: a914dda
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Thu Jun 8 15:08:52 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Jun 12 13:09:34 2017 -0700
----------------------------------------------------------------------
.../libprocess/cmake/Process3rdpartyConfigure.cmake | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/9dba260c/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
index 8da6ce6..9e2da3a 100644
--- a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -19,6 +19,7 @@
set(STOUT ${MESOS_3RDPARTY_SRC}/stout)
EXTERNAL("boost" ${BOOST_VERSION} "${MESOS_3RDPARTY_BIN}")
+EXTERNAL("glog" ${GLOG_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("elfio" ${ELFIO_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("picojson" ${PICOJSON_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("http_parser" ${HTTP_PARSER_VERSION} "${MESOS_3RDPARTY_BIN}")
@@ -28,20 +29,13 @@ EXTERNAL("libapr" ${LIBAPR_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("nvml" ${NVML_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("protobuf" ${PROTOBUF_VERSION} "${MESOS_3RDPARTY_BIN}")
-if (NOT WIN32)
- EXTERNAL("glog" ${GLOG_VERSION} "${MESOS_3RDPARTY_BIN}")
-elseif (WIN32)
- # Glog 0.3.3 does not compile out of the box on Windows.
- # Therefore, we require a specific commit on glog master.
- EXTERNAL("glog" "da816ea70" "${MESOS_3RDPARTY_BIN}")
-
+if (WIN32)
# NOTE: We expect cURL and zlib exist on Unix (usually pulled in with a
# package manager), but Windows has no package manager, so we have to go
# get it.
EXTERNAL("curl" ${CURL_VERSION} "${MESOS_3RDPARTY_BIN}")
-
EXTERNAL("zlib" ${ZLIB_VERSION} "${MESOS_3RDPARTY_BIN}")
-endif (NOT WIN32)
+endif ()
# Intermediate convenience variables for oddly-structured directories.
set(GLOG_LIB_ROOT ${GLOG_ROOT}-lib/lib)