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 2015/09/28 01:27:48 UTC
[09/20] mesos git commit: CMake: Used version info from
`Versions.cmake` instead of magic strings.
CMake: Used version info from `Versions.cmake` instead of magic strings.
Currently we configure the version information of third-party
dependencies in the CMake build system from magic strings.
This commit will transition away from the magic string solution and
towards the variables we define in `Versions.cmake`.
Review: https://reviews.apache.org/r/38542
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/a2af52a6
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/a2af52a6
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/a2af52a6
Branch: refs/heads/master
Commit: a2af52a6b7c01161f45d9ba6cabda733ecd9d62f
Parents: b610deb
Author: Alex Clemmer <cl...@gmail.com>
Authored: Sun Sep 27 15:41:23 2015 -0700
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Sun Sep 27 16:11:29 2015 -0700
----------------------------------------------------------------------
3rdparty/libprocess/cmake/ProcessConfigure.cmake | 12 ++++++------
3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake | 4 ++--
2 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/a2af52a6/3rdparty/libprocess/cmake/ProcessConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/ProcessConfigure.cmake b/3rdparty/libprocess/cmake/ProcessConfigure.cmake
index a956054..8c89cd7 100755
--- a/3rdparty/libprocess/cmake/ProcessConfigure.cmake
+++ b/3rdparty/libprocess/cmake/ProcessConfigure.cmake
@@ -51,13 +51,13 @@ set(PROCESS_3RD_BIN ${CMAKE_BINARY_DIR}/3rdparty/libprocess/3rdparty)
set(STOUT ${PROCESS_3RD_SRC}/stout)
-EXTERNAL("boost" "1.53.0" "${PROCESS_3RD_BIN}")
-EXTERNAL("picojson" "1.3.0" "${PROCESS_3RD_BIN}")
-EXTERNAL("http_parser" "1c3624a" "${PROCESS_3RD_BIN}")
-EXTERNAL("libev" "4.15" "${PROCESS_3RD_BIN}")
+EXTERNAL("boost" ${BOOST_VERSION} "${PROCESS_3RD_BIN}")
+EXTERNAL("picojson" ${PICOJSON_VERSION} "${PROCESS_3RD_BIN}")
+EXTERNAL("http_parser" ${HTTP_PARSER_VERSION} "${PROCESS_3RD_BIN}")
+EXTERNAL("libev" ${LIBEV_VERSION} "${PROCESS_3RD_BIN}")
if (NOT WIN32)
- EXTERNAL("glog" "0.3.3" "${PROCESS_3RD_BIN}")
+ EXTERNAL("glog" ${GLOG_VERSION} "${PROCESS_3RD_BIN}")
elseif (WIN32)
# Glog 0.3.3 does not compile out of the box on Windows. Therefore, we
# require 0.3.4.
@@ -69,7 +69,7 @@ set(GLOG_LIB ${GLOG_ROOT}-lib/lib)
# Directory structure for windows-only third-party libs.
########################################################
if (WIN32)
- EXTERNAL("curl" "7.43.0" "${PROCESS_3RD_BIN}")
+ EXTERNAL("curl" ${CURL_VERSION} "${PROCESS_3RD_BIN}")
endif (WIN32)
# Define process library dependencies. Tells the process library build targets
http://git-wip-us.apache.org/repos/asf/mesos/blob/a2af52a6/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
index 9e4dcb8..e105bd8 100644
--- a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
+++ b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake
@@ -33,8 +33,8 @@
# DIRECTORY STRUCTURE FOR THIRD-PARTY LIBS REQUIRED FOR TEST INFRASTRUCTURE.
############################################################################
-EXTERNAL("gmock" "1.7.0" "${PROCESS_3RD_BIN}")
-EXTERNAL("protobuf" "2.5.0" "${PROCESS_3RD_BIN}")
+EXTERNAL("gmock" ${GMOCK_VERSION} "${PROCESS_3RD_BIN}")
+EXTERNAL("protobuf" ${PROTOBUF_VERSION} "${PROCESS_3RD_BIN}")
set(GTEST_SRC ${GMOCK_ROOT}/gtest)
set(GPERFTOOLS_VERSION 2.0)