You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by mp...@apache.org on 2016/02/25 00:37:28 UTC
[1/2] mesos git commit: CMake: Force GMock and Libevent to build and
link statically.
Repository: mesos
Updated Branches:
refs/heads/master 94c491db1 -> 928ac801a
CMake: Force GMock and Libevent to build and link statically.
Review: https://reviews.apache.org/r/43407/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b697f037
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b697f037
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b697f037
Branch: refs/heads/master
Commit: b697f03703d60000b3132b971afd04e4fb45c89e
Parents: 94c491d
Author: Alex Clemmer <cl...@gmail.com>
Authored: Wed Feb 24 15:07:21 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Wed Feb 24 15:37:04 2016 -0800
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/CMakeLists.txt | 18 +++++++++++++++++-
.../cmake/Process3rdpartyConfigure.cmake | 5 ++++-
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b697f037/3rdparty/libprocess/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt
index 9b61376..99f48c2 100644
--- a/3rdparty/libprocess/3rdparty/CMakeLists.txt
+++ b/3rdparty/libprocess/3rdparty/CMakeLists.txt
@@ -119,10 +119,25 @@ elseif (WIN32)
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)
set(RY_UPDATE_CMD ${CMAKE_COMMAND} -E copy ${PROCESS_3RD_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}
+ )
+
# Third-party libraries. Tell the build system how to pull in and build third-
# party libraries at compile time, using the ExternalProject_Add macro.
##############################################################################
@@ -177,7 +192,7 @@ elseif (ENABLE_LIBEVENT)
ExternalProject_Add(
${LIBEVENT_TARGET}
PREFIX ${LIBEVENT_CMAKE_ROOT}
- CMAKE_ARGS -LH -DEVENT__DISABLE_OPENSSL=TRUE
+ CMAKE_ARGS ${LIBEVENT_CMAKE_ARGS}
INSTALL_COMMAND ${LIBEVENT_INSTALL_CMD}
URL ${LIBEVENT_URL}
)
@@ -259,6 +274,7 @@ endif (NOT WIN32)
ExternalProject_Add(
${GMOCK_TARGET}
PREFIX ${GMOCK_CMAKE_ROOT}
+ CMAKE_ARGS -DBUILD_SHARED_LIBS=FALSE
CONFIGURE_COMMAND ${GMOCK_CONFIG_CMD}
BUILD_COMMAND ${GMOCK_BUILD_CMD}
INSTALL_COMMAND ${GMOCK_INSTALL_CMD}
http://git-wip-us.apache.org/repos/asf/mesos/blob/b697f037/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
index d36fa2f..b7b61f6 100644
--- a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -55,16 +55,19 @@ set(BOOST_INCLUDE_DIR ${BOOST_ROOT})
set(GPERFTOOLS_INCLUDE_DIR ${GPERFTOOLS}/src)
set(HTTP_PARSER_INCLUDE_DIR ${HTTP_PARSER_ROOT})
set(LIBEV_INCLUDE_DIR ${LIBEV_ROOT})
-set(LIBEVENT_INCLUDE_DIR ${LIBEVENT_LIB_ROOT}/include)
set(PICOJSON_INCLUDE_DIR ${PICOJSON_ROOT})
if (WIN32)
set(CURL_INCLUDE_DIR ${CURL_ROOT}/include)
set(GLOG_INCLUDE_DIR ${GLOG_ROOT}/src/windows)
set(PROTOBUF_INCLUDE_DIR ${PROTOBUF_ROOT}/src)
+ set(LIBEVENT_INCLUDE_DIR
+ ${LIBEVENT_ROOT}/include
+ ${LIBEVENT_ROOT}-build/include)
else (WIN32)
set(GLOG_INCLUDE_DIR ${GLOG_LIB_ROOT}/include)
set(PROTOBUF_INCLUDE_DIR ${PROTOBUF_LIB_ROOT}/include)
+ set(LIBEVENT_INCLUDE_DIR ${LIBEVENT_LIB_ROOT}/include)
endif (WIN32)
# Convenience variables for `lib` directories of built third-party dependencies.
[2/2] mesos git commit: Windows: Added `src/resource_estimator.cpp`
to build.
Posted by mp...@apache.org.
Windows: Added `src/resource_estimator.cpp` to build.
Review: https://reviews.apache.org/r/43409/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/928ac801
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/928ac801
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/928ac801
Branch: refs/heads/master
Commit: 928ac801ad086b16d97f2996f708d8300d0594df
Parents: b697f03
Author: Alex Clemmer <cl...@gmail.com>
Authored: Mon Feb 22 13:47:03 2016 -0800
Committer: Michael Park <mp...@apache.org>
Committed: Wed Feb 24 15:37:07 2016 -0800
----------------------------------------------------------------------
src/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/928ac801/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b13fb23..49a5645 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -212,6 +212,7 @@ set(AGENT_SRC
slave/metrics.cpp
slave/paths.cpp
slave/state.cpp
+ slave/resource_estimator.cpp
)
if (NOT WIN32)
@@ -223,7 +224,6 @@ if (NOT WIN32)
slave/monitor.cpp
slave/qos_controller.cpp
slave/qos_controllers/noop.cpp
- slave/resource_estimator.cpp
slave/slave.cpp
slave/status_update_manager.cpp
slave/validation.cpp