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 2016/03/01 19:30:05 UTC
[09/11] mesos git commit: CMake:[3/3] Used Stout config script in
agent build.
CMake:[3/3] Used Stout config script in agent build.
Review: https://reviews.apache.org/r/43699/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4194e395
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4194e395
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4194e395
Branch: refs/heads/master
Commit: 4194e395d31411416e3e9b0f7bb30d6845a2b8e8
Parents: 684fce0
Author: Alex Clemmer <cl...@gmail.com>
Authored: Mon Feb 29 15:31:26 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Tue Mar 1 10:25:58 2016 -0800
----------------------------------------------------------------------
CMakeLists.txt | 1 +
src/slave/cmake/SlaveConfigure.cmake | 27 +++++++++++++++++----------
2 files changed, 18 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4194e395/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc0082f..54b1da7 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,7 @@ endif (WIN32 AND (NOT ENABLE_LIBEVENT))
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/cmake)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/libprocess/cmake)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/libprocess/3rdparty/stout/cmake)
list(
APPEND
CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/3rdparty/libprocess/cmake/macros)
http://git-wip-us.apache.org/repos/asf/mesos/blob/4194e395/src/slave/cmake/SlaveConfigure.cmake
----------------------------------------------------------------------
diff --git a/src/slave/cmake/SlaveConfigure.cmake b/src/slave/cmake/SlaveConfigure.cmake
index a8270a9..5697a0b 100644
--- a/src/slave/cmake/SlaveConfigure.cmake
+++ b/src/slave/cmake/SlaveConfigure.cmake
@@ -14,15 +14,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+include(StoutConfigure)
+
+if (NOT WIN32)
+ find_package(Apr REQUIRED)
+ find_package(Svn REQUIRED)
+endif (NOT WIN32)
+
# Define process library dependencies. Tells the process library build targets
# download/configure/build all third-party libraries before attempting to build.
################################################################################
set(AGENT_DEPENDENCIES
${AGENT_DEPENDENCIES}
+ ${PROCESS_DEPENDENCIES}
${PROCESS_TARGET}
- ${BOOST_TARGET}
- ${GLOG_TARGET}
- ${PICOJSON_TARGET}
${ZOOKEEPER_TARGET}
make_bin_include_dir
make_bin_src_dir
@@ -41,11 +46,6 @@ set(AGENT_INCLUDE_DIRS
${MESOS_SRC_DIR}
${PROCESS_INCLUDE_DIRS}
- ${STOUT_INCLUDE_DIR}
- ${BOOST_INCLUDE_DIR}
- ${GLOG_INCLUDE_DIR}
- ${PICOJSON_INCLUDE_DIR}
- ${PROTOBUF_INCLUDE_DIR}
${ZOOKEEPER_INCLUDE_DIR}
${ZOOKEEPER_INCLUDE_GENDIR}
)
@@ -57,7 +57,6 @@ set(AGENT_INCLUDE_DIRS
set(AGENT_LIB_DIRS
${AGENT_LIB_DIRS}
${PROCESS_LIB_DIRS}
- ${GLOG_LIB_DIR}
${ZOOKEEPER_LIB_DIR}
)
@@ -67,9 +66,17 @@ set(AGENT_LIB_DIRS
set(AGENT_LIBS
${AGENT_LIBS}
${PROCESS_LIBS}
- ${GLOG_LFLAG}
+ ${ZOOKEEPER_LFLAG}
+ ${PROCESS_TARGET}
)
+if (NOT WIN32)
+ set(AGENT_LIBS
+ ${AGENT_LIBS}
+ ${SASL_LFLAG}
+ )
+endif (NOT WIN32)
+
if (NOT ENABLE_LIBEVENT)
set(AGENT_LIBS ${AGENT_LIBS} ${LIBEV_LFLAG})
elseif (ENABLE_LIBEVENT)