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/09/03 12:51:26 UTC
[04/42] mesos git commit: CMake: Linked `libprocess` to `stout`
interface library.
CMake: Linked `libprocess` to `stout` interface library.
This follows up on https://reviews.apache.org/r/61286/
which changed stout to an interface library. With this change,
downstream users of stout no longer need to know the directories
of stout. Instead, including stout in `target_link_libraries`
is sufficient.
Review: https://reviews.apache.org/r/61288/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cd7ec918
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cd7ec918
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cd7ec918
Branch: refs/heads/master
Commit: cd7ec918a3627b817a69ca0e942bd5d1441d987e
Parents: 3b9658a
Author: Andrew Schwartzmeyer <an...@schwartzmeyer.com>
Authored: Mon Aug 7 18:16:33 2017 -0700
Committer: Joseph Wu <jo...@apache.org>
Committed: Sun Sep 3 05:51:05 2017 -0700
----------------------------------------------------------------------
.../libprocess/cmake/Process3rdpartyConfigure.cmake | 4 ----
3rdparty/libprocess/cmake/ProcessConfigure.cmake | 14 +++++---------
3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake | 1 +
3 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cd7ec918/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
index 3e621f9..b9d8dc9 100644
--- a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
+++ b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake
@@ -16,8 +16,6 @@
# DEFINE DIRECTORY STRUCTURE FOR THIRD-PARTY LIBS.
##################################################
-set(STOUT ${MESOS_3RDPARTY_SRC}/stout)
-
EXTERNAL("boost" ${BOOST_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("concurrentqueue" ${CONCURRENTQUEUE_VERSION} "${MESOS_3RDPARTY_BIN}")
EXTERNAL("glog" ${GLOG_VERSION} "${MESOS_3RDPARTY_BIN}")
@@ -46,7 +44,6 @@ set(LIBEVENT_LIB_ROOT ${LIBEVENT_ROOT}-lib/lib)
# Convenience variables for include directories of third-party dependencies.
set(PROCESS_INCLUDE_DIR ${MESOS_3RDPARTY_SRC}/libprocess/include)
-set(STOUT_INCLUDE_DIR ${STOUT}/include)
set(BOOST_INCLUDE_DIR ${BOOST_ROOT})
set(CONCURRENTQUEUE_INCLUDE_DIR ${CONCURRENTQUEUE_ROOT})
@@ -145,5 +142,4 @@ endif ()
# Configure the process library, the last of our third-party libraries.
#######################################################################
-include(StoutConfigure)
include(ProcessConfigure)
http://git-wip-us.apache.org/repos/asf/mesos/blob/cd7ec918/3rdparty/libprocess/cmake/ProcessConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/ProcessConfigure.cmake b/3rdparty/libprocess/cmake/ProcessConfigure.cmake
index 75af774..b9281b1 100755
--- a/3rdparty/libprocess/cmake/ProcessConfigure.cmake
+++ b/3rdparty/libprocess/cmake/ProcessConfigure.cmake
@@ -65,12 +65,11 @@ macro(GROUP_PROCESS_HEADERS)
"*.h*")
endmacro()
-# Define process library dependencies. Tells the process library build targets
+# DEFINE PROCESS LIBRARY DEPENDENCIES. Tells the process library build targets
# download/configure/build all third-party libraries before attempting to build.
################################################################################
set(PROCESS_DEPENDENCIES
${PROCESS_DEPENDENCIES}
- ${STOUT_DEPENDENCIES}
${HTTP_PARSER_TARGET}
${CONCURRENTQUEUE_TARGET}
)
@@ -88,7 +87,7 @@ if (WIN32)
)
endif ()
-# Define third-party include directories. Tells compiler toolchain where to get
+# 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
@@ -98,8 +97,6 @@ set(PROCESS_INCLUDE_DIRS
set(PROCESS_3RDPARTY_INCLUDE_DIRS
${PROCESS_3RDPARTY_INCLUDE_DIRS}
- ${STOUT_3RDPARTY_INCLUDE_DIRS}
- ${STOUT_INCLUDE_DIRS}
${HTTP_PARSER_INCLUDE_DIR}
${CONCURRENTQUEUE_INCLUDE_DIR}
)
@@ -134,13 +131,12 @@ if (WIN32)
)
endif ()
-# Define third-party lib install directories. Used to tell the compiler
+# 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}
- ${STOUT_LIB_DIRS}
${HTTP_PARSER_LIB_DIR}
)
@@ -157,14 +153,14 @@ if (WIN32)
)
endif ()
-# Define third-party libs. Used to generate flags that the linker uses to
+# DEFINE THIRD-PARTY LIBS. Used to generate flags that the linker uses to
# include our third-party libs (e.g., -lglog on Linux).
#########################################################################
find_package(Threads REQUIRED)
set(PROCESS_LIBS
${PROCESS_LIBS}
- ${STOUT_LIBS}
+ stout
${HTTP_PARSER_LFLAG}
)
http://git-wip-us.apache.org/repos/asf/mesos/blob/cd7ec918/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
index 5a23990..b5454d4 100644
--- a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
+++ b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
@@ -14,6 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+# TODO(andschwa): Remove this when gmock and gtest can be included.
include(StoutTestsConfigure)
set(