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:16 UTC
[10/27] mesos git commit: CMake: Updated libevent build arguments.
CMake: Updated libevent build arguments.
This removes the hard-coded `C_FLAGS` and properly forwards all
arguments for each configuration. This also disables building the
unnecessary benchmark, tests, and samples artifacts.
Review: https://reviews.apache.org/r/59780/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d6b276cc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d6b276cc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d6b276cc
Branch: refs/heads/master
Commit: d6b276cc763046aac76926823cf2ffba18066d2b
Parents: 54bbd47
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Thu Jun 8 13:36:39 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Mon Jun 12 13:09:22 2017 -0700
----------------------------------------------------------------------
3rdparty/CMakeLists.txt | 46 +++++++++++++++++++-------------------------
1 file changed, 20 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d6b276cc/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index 0f6543a..3ba0ec7 100755
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -129,30 +129,24 @@ if (NOT WIN32)
PATCH_CMD(${MESOS_3RDPARTY_SRC}/libev-4.22.patch LIBEV_PATCH_CMD)
set(LIBEVENT_INSTALL_CMD mkdir -p ${LIBEVENT_LIB_ROOT} && cp -r ${LIBEVENT_ROOT}-build/lib/. ${LIBEVENT_LIB_DIR} && cp -r ${LIBEVENT_ROOT}-build/include/. ${LIBEVENT_INCLUDE_DIR} && cp -r ${LIBEVENT_ROOT}/include/. ${LIBEVENT_INCLUDE_DIR})
-elseif (WIN32)
+else ()
set(GLOG_INSTALL_CMD ${CMAKE_NOOP})
set(GLOG_PATCH_CMD ${PATCHEXE_LOCATION} -p1 < ${MESOS_3RDPARTY_SRC}/glog-${GLOG_VERSION}.patch)
set(LIBEVENT_INSTALL_CMD ${CMAKE_NOOP})
set(LIBAPR_INSTALL_CMD ${CMAKE_NOOP})
-
- set(LIBEVENT_C_FLAGS "/MTd /Zi")
- set(LIBEVENT_CMAKE_ARGS
- ${LIBEVENT_CMAKE_ARGS}
- -DCMAKE_C_FLAGS_DEBUG=${LIBEVENT_C_FLAGS}
- -DCMAKE_C_FLAGS_RELEASE=${LIBEVENT_C_FLAGS}
- -DEVENT__DISABLE_OPENSSL=TRUE
- )
-endif (NOT WIN32)
+endif ()
set(HTTP_PARSER_UPDATE_CMD ${CMAKE_COMMAND} -E copy ${MESOS_3RDPARTY_SRC}/http-parser/CMakeLists.txt.template ${HTTP_PARSER_ROOT}/CMakeLists.txt)
set(LIBEVENT_CMAKE_ARGS
${LIBEVENT_CMAKE_ARGS}
- -LH
- -DEVENT__HAVE_SYS_STAT_H=1
- -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+ # NOTE: Libevent does not respect the BUILD_SHARED_LIBS global flag.
+ -DEVENT__BUILD_SHARED_LIBRARIES=${BUILD_SHARED_LIBS}
+ -DEVENT__DISABLE_BENCHMARK=ON
+ -DEVENT__DISABLE_TESTS=ON
+ -DEVENT__DISABLE_SAMPLES=ON
)
if (ENABLE_SSL)
@@ -160,19 +154,19 @@ if (ENABLE_SSL)
${LIBEVENT_CMAKE_ARGS}
-DEVENT__DISABLE_OPENSSL=OFF
)
-else (ENABLE_SSL)
+else ()
set(LIBEVENT_CMAKE_ARGS
${LIBEVENT_CMAKE_ARGS}
-DEVENT__DISABLE_OPENSSL=ON
)
-endif (ENABLE_SSL)
+endif ()
if (NOT WIN32)
set(LIBEVENT_CMAKE_ARGS
${LIBEVENT_CMAKE_ARGS}
-DCMAKE_C_FLAGS=-fPIC
)
-endif (NOT WIN32)
+endif ()
# Third-party libraries. Tell the build system how to pull in and build third-
@@ -260,22 +254,22 @@ if (NOT ENABLE_LIBEVENT)
elseif (ENABLE_LIBEVENT)
ExternalProject_Add(
${LIBEVENT_TARGET}
- PREFIX ${LIBEVENT_CMAKE_ROOT}
- CMAKE_ARGS ${LIBEVENT_CMAKE_ARGS}
- INSTALL_COMMAND ${LIBEVENT_INSTALL_CMD}
- URL ${LIBEVENT_URL}
- URL_HASH ${LIBEVENT_HASH}
+ PREFIX ${LIBEVENT_CMAKE_ROOT}
+ CMAKE_ARGS ${CMAKE_FORWARD_ARGS};${LIBEVENT_CMAKE_ARGS}
+ INSTALL_COMMAND ${LIBEVENT_INSTALL_CMD}
+ URL ${LIBEVENT_URL}
+ URL_HASH ${LIBEVENT_HASH}
)
endif (NOT ENABLE_LIBEVENT)
if (WIN32)
ExternalProject_Add(
${LIBAPR_TARGET}
- PREFIX ${LIBAPR_CMAKE_ROOT}
- CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF
- INSTALL_COMMAND ${LIBAPR_INSTALL_CMD}
- URL ${LIBAPR_URL}
- URL_HASH ${LIBAPR_HASH}
+ PREFIX ${LIBAPR_CMAKE_ROOT}
+ CMAKE_ARGS ${CMAKE_FORWARD_ARGS}
+ INSTALL_COMMAND ${LIBAPR_INSTALL_CMD}
+ URL ${LIBAPR_URL}
+ URL_HASH ${LIBAPR_HASH}
)
endif (WIN32)