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:06 UTC
[10/11] mesos git commit: CMake:[2/3] Used new Stout config script in
libprocess 3rdparty build.
CMake:[2/3] Used new Stout config script in libprocess 3rdparty build.
Review: https://reviews.apache.org/r/43698/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/684fce00
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/684fce00
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/684fce00
Branch: refs/heads/master
Commit: 684fce00f04b26f2c17a47063c332281b4c147c3
Parents: 86191221
Author: Alex Clemmer <cl...@gmail.com>
Authored: Mon Feb 29 15:31:19 2016 -0800
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Tue Mar 1 10:25:58 2016 -0800
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/CMakeLists.txt | 1 +
.../cmake/Process3rdpartyConfigure.cmake | 1 +
.../libprocess/cmake/ProcessConfigure.cmake | 39 +++-----------------
3 files changed, 8 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/684fce00/3rdparty/libprocess/3rdparty/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt
index ad979e5..b8351ad 100644
--- a/3rdparty/libprocess/3rdparty/CMakeLists.txt
+++ b/3rdparty/libprocess/3rdparty/CMakeLists.txt
@@ -292,5 +292,6 @@ list(
APPEND CMAKE_MODULE_PATH
${CMAKE_SOURCE_DIR}/3rdparty/libprocess/3rdparty/stout/cmake
)
+include(StoutConfigure)
include(StoutTestsConfigure)
add_subdirectory(stout/tests)
http://git-wip-us.apache.org/repos/asf/mesos/blob/684fce00/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
index 167b599..e42cf19 100644
--- a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -118,6 +118,7 @@ endif (NOT WIN32)
# Configure the process library, the last of our third-party libraries.
#######################################################################
+include(StoutConfigure)
include(ProcessConfigure)
# Define target for AGENT.
http://git-wip-us.apache.org/repos/asf/mesos/blob/684fce00/3rdparty/libprocess/cmake/ProcessConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/ProcessConfigure.cmake b/3rdparty/libprocess/cmake/ProcessConfigure.cmake
index 6b804cd..61edad9 100755
--- a/3rdparty/libprocess/cmake/ProcessConfigure.cmake
+++ b/3rdparty/libprocess/cmake/ProcessConfigure.cmake
@@ -49,11 +49,8 @@ set(PROCESS_TARGET process-${PROCESS_PACKAGE_VERSION})
################################################################################
set(PROCESS_DEPENDENCIES
${PROCESS_DEPENDENCIES}
- ${BOOST_TARGET}
- ${GLOG_TARGET}
- ${PICOJSON_TARGET}
+ ${STOUT_DEPENDENCIES}
${HTTP_PARSER_TARGET}
- ${PROTOBUF_TARGET}
)
if (NOT ENABLE_LIBEVENT)
@@ -62,20 +59,13 @@ elseif (ENABLE_LIBEVENT)
set(PROCESS_DEPENDENCIES ${PROCESS_DEPENDENCIES} ${LIBEVENT_TARGET})
endif (NOT ENABLE_LIBEVENT)
-if (WIN32)
- set(PROCESS_DEPENDENCIES ${PROCESS_DEPENDENCIES} ${CURL_TARGET})
-endif (WIN32)
-
# Define third-party include directories. Tells compiler toolchain where to get
# headers for our third party libs (e.g., -I/path/to/glog on Linux).
###############################################################################
set(PROCESS_INCLUDE_DIRS
${PROCESS_INCLUDE_DIRS}
+ ${STOUT_INCLUDE_DIRS}
${PROCESS_INCLUDE_DIR}
- ${STOUT_INCLUDE_DIR}
- ${BOOST_INCLUDE_DIR}
- ${PICOJSON_INCLUDE_DIR}
- ${GLOG_INCLUDE_DIR}
${HTTP_PARSER_INCLUDE_DIR}
)
@@ -89,17 +79,13 @@ if (HAS_GPERFTOOLS)
set(PROCESS_INCLUDE_DIRS ${PROCESS_INCLUDE_DIRS} ${GPERFTOOLS_INCLUDE_DIR})
endif (HAS_GPERFTOOLS)
-if (WIN32)
- set(PROCESS_INCLUDE_DIRS ${PROCESS_INCLUDE_DIRS} ${CURL_INCLUDE_DIR})
-endif (WIN32)
-
# Define third-party lib install directories. Used to tell the compiler
# toolchain where to find our third party libs (e.g., -L/path/to/glog on
# Linux).
########################################################################
set(PROCESS_LIB_DIRS
${PROCESS_LIB_DIRS}
- ${GLOG_LIB_DIR}
+ ${STOUT_LIB_DIRS}
${HTTP_PARSER_LIB_DIR}
)
@@ -109,11 +95,6 @@ elseif (ENABLE_LIBEVENT)
set(PROCESS_LIB_DIRS ${PROCESS_LIB_DIRS} ${LIBEVENT_LIB_DIR})
endif (NOT ENABLE_LIBEVENT)
-if (WIN32)
- set(PROCESS_LIB_DIRS ${PROCESS_LIB_DIRS} ${CURL_LIB_DIR})
-endif (WIN32)
-
-
# Define third-party libs. Used to generate flags that the linker uses to
# include our third-party libs (e.g., -lglog on Linux).
#########################################################################
@@ -121,9 +102,8 @@ find_package(Threads REQUIRED)
set(PROCESS_LIBS
${PROCESS_LIBS}
- ${GLOG_LFLAG}
+ ${STOUT_LIBS}
${HTTP_PARSER_LFLAG}
- ${CMAKE_THREAD_LIBS_INIT}
)
if (NOT ENABLE_LIBEVENT)
@@ -132,14 +112,7 @@ elseif (ENABLE_LIBEVENT)
set(PROCESS_LIBS ${PROCESS_LIBS} ${LIBEVENT_LFLAG})
endif (NOT ENABLE_LIBEVENT)
-if (WIN32)
- set(PROCESS_LIBS
- ${PROCESS_LIBS}
- ${CURL_LFLAG}
- ws2_32
- Mswsock
- )
-elseif (NOT WIN32)
+if (NOT WIN32)
find_package(ZLIB REQUIRED)
# TODO(hausdorff): (MESOS-3396) The `LINUX` flag comes from MesosConfigure;
@@ -155,4 +128,4 @@ elseif (NOT WIN32)
${ZLIB_LIBRARIES}
pthread
)
-endif (WIN32)
+endif (NOT WIN32)