mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From josep...@apache.org
Subject [2/2] mesos git commit: Windows: Updated libprocess CMake setup for Glog patch.
Date Tue, 14 Mar 2017 18:58:09 GMT
Windows: Updated libprocess CMake setup for Glog patch.

The additional Windows library `Dbghelp` must be linked for the
in addition to glog, in order to enable stack traces.

NOTE: CMake's dependency graph does not pull in the `Dbghelp` library
automatically as the glog dependency is added into Mesos as an
"external" project.  If we were to, instead, add glog's CMake files
to the build system directly (such as, as a git submodule), glog's
targets would be inherited.

Review: https://reviews.apache.org/r/57491/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5d3908a4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5d3908a4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5d3908a4

Branch: refs/heads/master
Commit: 5d3908a4c3312a41ad801683089ea14eae9b0360
Parents: ef3ebf3
Author: Andrew Schwartzmeyer <andrew@schwartzmeyer.com>
Authored: Mon Mar 13 18:16:23 2017 -0700
Committer: Joseph Wu <josephwu@apache.org>
Committed: Tue Mar 14 10:38:08 2017 -0700

----------------------------------------------------------------------
 .../libprocess/cmake/Process3rdpartyConfigure.cmake   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/5d3908a4/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
index e9eabd0..83406f2 100644
--- a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -31,9 +31,9 @@ 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 0.3.4.
-  EXTERNAL("glog" "0.3.4" "${MESOS_3RDPARTY_BIN}")
+  # 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}")
 
   # 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
@@ -111,6 +111,14 @@ if (WIN32)
 
   # Windows requires a static build of zlib.
   set(ZLIB_LFLAG     zlibstaticd)
+
+  # Windows requires Dbghelp.lib when linking to glog.
+  # NOTE: CMake's dependency graph does not pull in the `Dbghelp` library
+  # automatically as the glog dependency is added into Mesos as an
+  # "external" project.  If we were to, instead, add glog's CMake files
+  # to the build system directly (such as, as a git submodule), glog's
+  # targets would be inherited.
+  set(GLOG_LFLAG     glog Dbghelp)
 else (WIN32)
   set(CURL_LFLAG     curl)
   set(DL_LFLAG       dl)


Mime
View raw message