You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bb...@apache.org on 2019/04/12 12:16:40 UTC
[mesos] branch master updated: Prevented bundled glog cmake build
from finding system gflags.
This is an automated email from the ASF dual-hosted git repository.
bbannier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
The following commit(s) were added to refs/heads/master by this push:
new 53b0feb Prevented bundled glog cmake build from finding system gflags.
53b0feb is described below
commit 53b0febba0f388870fb73842545fc5aafc2c886c
Author: Benjamin Bannier <be...@mesosphere.io>
AuthorDate: Fri Apr 12 14:06:22 2019 +0200
Prevented bundled glog cmake build from finding system gflags.
Since glog-0.4.0 the glog cmake build seems to find a system-wide
installation of gflags and use that to implicitly enable additional
features which we do not use. Due to the way glog is integrated into
our cmake build we can then end up in a situation where we
successfully build the bundled glog, but cannot include all its
required headers.
This patch fixes the cmake flags of the bundled glog so it never uses
gflags which 1) is more deterministic and 2) addresses above mentioned
build issue.
Review: https://reviews.apache.org/r/70466/
---
3rdparty/CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 0a33ed9..a143b70 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -417,6 +417,7 @@ set(
-DCMAKE_INSTALL_BINDIR=${GLOG_INSTALL_DIR}/bin
-DCMAKE_INSTALL_INCLUDEDIR=${GLOG_INSTALL_DIR}/include
-DCMAKE_INSTALL_LIBDIR=${GLOG_INSTALL_DIR}/lib
+ -DWITH_GFLAGS=OFF
)
MAKE_INCLUDE_DIR(glog)