Repository: mesos Updated Branches: refs/heads/master a5ce87b26 -> c9854b864
CMake:[1/2] Added support for new `3rdparty/` directory structure. Review: https://reviews.apache.org/r/47284/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4beff1f1 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4beff1f1 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4beff1f1 Branch: refs/heads/master Commit: 4beff1f1e9b969e0e9567f1b5e03f197cbdbdbe1 Parents: a5ce87b Author: Alex Clemmer <[email protected]> Authored: Thu May 12 02:11:35 2016 -0400 Committer: Kapil Arya <[email protected]> Committed: Thu May 12 02:11:35 2016 -0400 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/CMakeLists.txt | 307 ------------------- 3rdparty/libprocess/CMakeLists.txt | 4 - .../cmake/Process3rdpartyConfigure.cmake | 29 +- .../cmake/ProcessTestsConfigure.cmake | 4 +- 3rdparty/libprocess/cmake/macros/External.cmake | 4 +- 5 files changed, 17 insertions(+), 331 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/4beff1f1/3rdparty/libprocess/3rdparty/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt deleted file mode 100644 index 3b0c7ed..0000000 --- a/3rdparty/libprocess/3rdparty/CMakeLists.txt +++ /dev/null @@ -1,307 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -include(ExternalProject) - -# Downloads, configures, and compiles the third-party libraries for the process -# library (i.e., 3rdparty/libprocess/3rdparty). - -# Define sources of third-party dependencies. -############################################# -set(UPSTREAM_URL ${3RDPARTY_DEPENDENCIES}) -set(REBUNDLED_DIR ${CMAKE_CURRENT_SOURCE_DIR}) -if (REBUNDLED) - set(BOOST_URL ${REBUNDLED_DIR}/boost-${BOOST_VERSION}.tar.gz) - set(GLOG_URL ${REBUNDLED_DIR}/glog-${GLOG_VERSION}.tar.gz) - set(PICOJSON_URL ${REBUNDLED_DIR}/picojson-${PICOJSON_VERSION}.tar.gz) - set(HTTP_PARSER_URL ${REBUNDLED_DIR}/http-parser-${HTTP_PARSER_VERSION}.tar.gz) - set(LIBEV_URL ${REBUNDLED_DIR}/libev-${LIBEV_VERSION}.tar.gz) -else (REBUNDLED) - set(BOOST_URL ${UPSTREAM_URL}/boost-${BOOST_VERSION}.tar.gz) - set(GLOG_URL ${UPSTREAM_URL}/glog-${GLOG_VERSION}.tar.gz) - set(PICOJSON_URL ${UPSTREAM_URL}/picojson-${PICOJSON_VERSION}.tar.gz) - set(HTTP_PARSER_URL ${UPSTREAM_URL}/http-parser-${HTTP_PARSER_VERSION}.tar.gz) - set(LIBEV_URL ${UPSTREAM_URL}/libev-${LIBEV_VERSION}.tar.gz) -endif (REBUNDLED) - -# NOTE: libevent doesn't come rebundled, so this URL is always the same. But, -# it's only downloaded if `ENABLE_LIBEVENT` is set. -set(LIBEVENT_URL ${UPSTREAM_URL}/libevent-release-${LIBEVENT_VERSION}.tar.gz) - -if (WIN32) - # TODO(hausdorff): (MESOS-3394) Upgrade Windows to use glog v0.3.5 when they - # release it, as that will contain fixes that will allow us to build glog on - # Windows, as well as build using CMake directly. For now, we simply point - # Windows builds at a commit hash in the glog history that has all the - # functionality we want. - # - # Finally, for our third-party libraries, MSVC 1800 and 1900 are not - # linker-compatible, so it's important for us to be able to build glog - # (as well as all the other third-party dependencies) on MSVC 1900. - # - # [1] https://github.com/google/glog/pull/43 - set(GLOG_URL ${UPSTREAM_URL}/glog-v0.3.4-g4d391fe.tar.gz) - set(CURL_URL ${UPSTREAM_URL}/curl-${CURL_VERSION}.tar.gz) - set(LIBAPR_URL ${UPSTREAM_URL}/libapr-${LIBAPR_VERSION}.tar.gz) - set(ZLIB_URL ${UPSTREAM_URL}/zlib-${ZLIB_VERSION}.tar.gz) -endif (WIN32) - -# Define build/patch/configure commands for third-party libs. -############################################################# -# NOTE: (fix for MESOS-3250) A few third-party libraries (libev, gmock) do not -# have `make install` commands available, so below we have to add our own -# "install" commands. -# -# The reason is: if we do not, we get runtime library load problems on OS X. In -# particular, `dydl` will look for these libraries at the prefix we passed to -# `configure` (or in `/usr/local` if we did not pass a prefix in), but since -# they don't have a `make install` step, they never get placed in the prefix -# folder. -# -# Our solution is to: -# (1) make a lib directory inside the Mesos folder for each of the libraries -# that has no install step, and -# (2) copy all such libraries into their respective directories. -# -# (Note that step (1) is not only convenient, but important: make will add a -# `lib` to the end of your prefix path when linking, and since the built -# libraries end up in a `.libs` folder, it's not enough to simply pass the -# build directory into `configure` as a prefix; so if we're going to move the -# libraries, we might as well move them to a library folder.) -if (NOT WIN32) - set(GLOG_CONFIG_CMD ${GLOG_ROOT}/src/../configure --prefix=${GLOG_LIB_ROOT}) - set(GLOG_BUILD_CMD make) - set(GLOG_INSTALL_CMD make install) - # Patch glog to deal with a problem that appears when compiling on clang - # under the C++11 standard. cf. MESOS-860, MESOS-966. - PATCH_CMD(${PROCESS_3RD_SRC}/glog-0.3.3.patch GLOG_PATCH_CMD) - - # NOTE: `libev` is "installed" into a lib directory, see "NOTE: (fix for - # MESOS-3250)" comment above for explanation. - set(LIBEV_CONFIG_CMD ${LIBEV_ROOT}/configure --prefix=${LIBEV_ROOT}-lib) - set(LIBEV_BUILD_CMD make) - set(LIBEV_INSTALL_CMD mkdir -p ${LIBEV_LIB_ROOT} && cp -r ${LIBEV_ROOT}-build/.libs/. ${LIBEV_LIB_ROOT}) - # Patch libev to keep it from reaping child processes. - PATCH_CMD(${PROCESS_3RD_SRC}/libev-4.22.patch LIBEV_PATCH_CMD) - - set(LIBEVENT_INSTALL_CMD mkdir -p ${LIBEVENT_LIB_ROOT} && cp -r ${LIBEVENT_ROOT}-build/lib/. ${LIBEVENT_LIB_DIR} && cp -r ${LIBEVENT_ROOT}-build/include/. ${LIBEVENT_INCLUDE_DIR} && cp -r ${LIBEVENT_ROOT}/include/. ${LIBEVENT_INCLUDE_DIR}) -elseif (WIN32) - set(GLOG_INSTALL_CMD ${CMAKE_NOOP}) - - 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(HTTP_PARSER_UPDATE_CMD ${CMAKE_COMMAND} -E copy ${PROCESS_3RD_SRC}/http-parser/CMakeLists.txt.template ${HTTP_PARSER_ROOT}/CMakeLists.txt) - -if (NOT WIN32) - set(HTTP_PARSER_PATCH_CMD ${CMAKE_NOOP}) -elseif (WIN32) - # Set the patch command which will utilize patch.exe under - # `\Users\<user>\AppData\Local\Temp with no elevation prompt` - set(HTTP_PARSER_PATCH_CMD ${PATCHEXE_LOCATION} --binary -p1 < ${PROCESS_3RD_SRC}/http-parser-${HTTP_PARSER_VERSION}.patch) -endif (NOT WIN32) - -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. -############################################################################## -ExternalProject_Add( - ${BOOST_TARGET} - PREFIX ${BOOST_CMAKE_ROOT} - CONFIGURE_COMMAND ${CMAKE_NOOP} - BUILD_COMMAND ${CMAKE_NOOP} - INSTALL_COMMAND ${CMAKE_NOOP} - URL ${BOOST_URL} - ) - -# The patch, configure, build, and install commands are stubbed out on Windows -# builds so that it defaults to build using CMake. This is for the same reason -# as the GMock code library build, see the call to `ExternalProject_Add` for -# the GMock project below for more details. -ExternalProject_Add( - ${GLOG_TARGET} - PREFIX ${GLOG_CMAKE_ROOT} - CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} - PATCH_COMMAND ${GLOG_PATCH_CMD} - CONFIGURE_COMMAND ${GLOG_CONFIG_CMD} - BUILD_COMMAND ${GLOG_BUILD_CMD} - INSTALL_COMMAND ${GLOG_INSTALL_CMD} - URL ${GLOG_URL} - DOWNLOAD_NAME glog-${GLOG_VERSION}.tar.gz - ) - -ExternalProject_Add( - ${PICOJSON_TARGET} - PREFIX ${PICOJSON_CMAKE_ROOT} - CONFIGURE_COMMAND ${CMAKE_NOOP} - BUILD_COMMAND ${CMAKE_NOOP} - INSTALL_COMMAND ${CMAKE_NOOP} - URL ${PICOJSON_URL} - ) - -ExternalProject_Add( - ${HTTP_PARSER_TARGET} - PREFIX ${HTTP_PARSER_CMAKE_ROOT} - UPDATE_COMMAND ${HTTP_PARSER_UPDATE_CMD} - PATCH_COMMAND ${HTTP_PARSER_PATCH_CMD} - INSTALL_COMMAND ${CMAKE_NOOP} - URL ${HTTP_PARSER_URL} - ) - -if (NOT ENABLE_LIBEVENT) - ExternalProject_Add( - ${LIBEV_TARGET} - PREFIX ${LIBEV_CMAKE_ROOT} - PATCH_COMMAND ${LIBEV_PATCH_CMD} - CONFIGURE_COMMAND ${LIBEV_CONFIG_CMD} - BUILD_COMMAND ${LIBEV_BUILD_CMD} - INSTALL_COMMAND ${LIBEV_INSTALL_CMD} - URL ${LIBEV_URL} - ) -elseif (ENABLE_LIBEVENT) - ExternalProject_Add( - ${LIBEVENT_TARGET} - PREFIX ${LIBEVENT_CMAKE_ROOT} - CMAKE_ARGS ${LIBEVENT_CMAKE_ARGS} - INSTALL_COMMAND ${LIBEVENT_INSTALL_CMD} - URL ${LIBEVENT_URL} - ) -endif (NOT ENABLE_LIBEVENT) - -if (WIN32) - ExternalProject_Add( - ${LIBAPR_TARGET} - PREFIX ${LIBAPR_CMAKE_ROOT} - CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF - INSTALL_COMMAND ${LIBAPR_INSTALL_CMD} - URL ${LIBAPR_URL} - ) -endif (WIN32) - -# WINDOWS THIRD-PARTY LIBRARIES. Windows has no package manager, so we download -# them here. -############################################################################### -if (WIN32) - # TODO(hausdorff): maybe try to incorporate this into findpackage for Windows - ExternalProject_Add( - ${CURL_TARGET} - PREFIX ${CURL_CMAKE_ROOT} - CMAKE_ARGS -DBUILD_CURL_TESTS=OFF -DCURL_STATICLIB=ON -DCMAKE_C_FLAGS_DEBUG="/MTd" - PATCH_COMMAND ${CMAKE_NOOP} - BUILD_COMMAND msbuild /p:RuntimeLibrary=MT_StaticDebug lib/libcurl.vcxproj - INSTALL_COMMAND ${CMAKE_NOOP} - URL ${CURL_URL} - ) - - ExternalProject_Add( - ${ZLIB_TARGET} - PREFIX ${ZLIB_CMAKE_ROOT} - CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF - BUILD_COMMAND ${GLOG_BUILD_CMD} - INSTALL_COMMAND ${CMAKE_NOOP} - URL ${ZLIB_URL} - ) -endif (WIN32) - -# THIRD-PARTY LIBRARIES FOR TESTS. -################################## -if (REBUNDLED) - set(GMOCK_URL ${REBUNDLED_DIR}/gmock-${GMOCK_VERSION}.tar.gz) - set(PROTOBUF_URL ${REBUNDLED_DIR}/protobuf-${PROTOBUF_VERSION}.tar.gz) -else (REBUNDLED) - set(GMOCK_URL ${UPSTREAM_URL}/gmock-${GMOCK_VERSION}.tar.gz) - set(PROTOBUF_URL ${UPSTREAM_URL}/protobuf-${PROTOBUF_VERSION}.tar.gz) -endif (REBUNDLED) - -if (WIN32) - # TODO(hausdorff): (MESOS-3453) this is a patched version of the protobuf - # library that compiles on Windows. We need to either send this as a PR back - # to the protobuf project, or we need to apply these changes to our existing - # protobuf tarball in the patch step. - set(PROTOBUF_URL ${UPSTREAM_URL}/protobuf-3.0.0-beta-2.tar.gz) -endif (WIN32) - -# NOTE: `gmock` is "installed" into a lib directory, see "NOTE: (fix for -# MESOS-3250)" comment above for explanation. -if (NOT WIN32) - set(GMOCK_INSTALL_CMD mkdir -p ${GMOCK_ROOT}-lib/lib && cp -r ${GMOCK_ROOT}-build/. ${GMOCK_ROOT}-lib/lib && cp -r ${GMOCK_ROOT}-build/gtest/. ${GMOCK_ROOT}-lib/lib) -elseif (WIN32) - set(GMOCK_INSTALL_CMD ${CMAKE_NOOP}) -endif (NOT WIN32) - -if (NOT WIN32) - PATCH_CMD(${PROCESS_3RD_SRC}/protobuf-2.6.1.patch PROTOBUF_PATCH_CMD) - set(PROTOBUF_CONFIG_CMD ${PROTOBUF_ROOT}/src/../configure --prefix=${PROTOBUF_LIB_ROOT}) - set(PROTOBUF_BUILD_CMD make) - set(PROTOBUF_INSTALL_CMD make install) -elseif (WIN32) - set(PROTOBUF_CONFIG_CMD cmake -G "Visual Studio 14 2015 Win64" ../protobuf-${PROTOBUF_VERSION}/cmake -DBUILD_SHARED_LIBS=OFF -Dprotobuf_MSVC_STATIC_RUNTIME=ON -Dprotobuf_BUILD_TESTS=OFF) - set(PROTOBUF_BUILD_CMD msbuild protobuf.sln) - set(PROTOBUF_INSTALL_CMD ${CMAKE_NOOP}) -endif (NOT WIN32) - -# NOTE: An implicit consequence of the following code is that on non-Windows -# platforms, gmock and gtest are assumed to be CMake projects, and are thus -# configured and built using default CMake commands. The reason is that on -# non-Windows platforms, we choose to set `GMOCK_CONFIG_CMD` and -# `GMOCK_BUILD_CMD` with stub commands, which cause CMake to "fall back" to -# trying to build them with CMake. -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} - URL ${GMOCK_URL} - ) - -ExternalProject_Add( - ${PROTOBUF_TARGET} - PREFIX ${PROTOBUF_CMAKE_ROOT} - CMAKE_ARGS -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DCMAKE_CXX_FLAGS_DEBUG="/MTd" - PATCH_COMMAND ${PROTOBUF_PATCH_CMD} - CONFIGURE_COMMAND ${PROTOBUF_CONFIG_CMD} - BUILD_COMMAND ${PROTOBUF_BUILD_CMD} - INSTALL_COMMAND ${PROTOBUF_INSTALL_CMD} - URL ${PROTOBUF_URL} - ) - -# STOUT TESTING INFRASTRUCTURE. -############################### -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/4beff1f1/3rdparty/libprocess/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/CMakeLists.txt b/3rdparty/libprocess/CMakeLists.txt index 5633c39..9f85aed 100755 --- a/3rdparty/libprocess/CMakeLists.txt +++ b/3rdparty/libprocess/CMakeLists.txt @@ -15,10 +15,6 @@ # limitations under the License. include(ProcessTestsConfigure) -# BUILD THIRD-PARTY DEPENDENCIES FIRST. -####################################### -add_subdirectory(3rdparty) - # BUILD THE PROCESS LIBRARY. ############################ if (NOT WIN32) http://git-wip-us.apache.org/repos/asf/mesos/blob/4beff1f1/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake index ac75baf..2c4d2e0 100644 --- a/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake +++ b/3rdparty/libprocess/cmake/Process3rdpartyConfigure.cmake @@ -16,32 +16,29 @@ # DEFINE DIRECTORY STRUCTURE FOR THIRD-PARTY LIBS. ################################################## -set(PROCESS_3RD_SRC ${CMAKE_SOURCE_DIR}/3rdparty/libprocess/3rdparty) -set(PROCESS_3RD_BIN ${CMAKE_BINARY_DIR}/3rdparty/libprocess/3rdparty) +set(STOUT ${MESOS_3RDPARTY_SRC}/stout) -set(STOUT ${PROCESS_3RD_SRC}/stout) - -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}") -EXTERNAL("libevent" ${LIBEVENT_VERSION} "${PROCESS_3RD_BIN}") -EXTERNAL("libapr" ${LIBAPR_VERSION} "${PROCESS_3RD_BIN}") -EXTERNAL("protobuf" ${PROTOBUF_VERSION} "${PROCESS_3RD_BIN}") +EXTERNAL("boost" ${BOOST_VERSION} "${MESOS_3RDPARTY_BIN}") +EXTERNAL("picojson" ${PICOJSON_VERSION} "${MESOS_3RDPARTY_BIN}") +EXTERNAL("http_parser" ${HTTP_PARSER_VERSION} "${MESOS_3RDPARTY_BIN}") +EXTERNAL("libev" ${LIBEV_VERSION} "${MESOS_3RDPARTY_BIN}") +EXTERNAL("libevent" ${LIBEVENT_VERSION} "${MESOS_3RDPARTY_BIN}") +EXTERNAL("libapr" ${LIBAPR_VERSION} "${MESOS_3RDPARTY_BIN}") +EXTERNAL("protobuf" ${PROTOBUF_VERSION} "${MESOS_3RDPARTY_BIN}") if (NOT WIN32) - EXTERNAL("glog" ${GLOG_VERSION} "${PROCESS_3RD_BIN}") + EXTERNAL("glog" ${GLOG_VERSION} "${MESOS_3RDPARTY_BIN}") elseif (WIN32) # Glog 0.3.3 does not compile out of the box on Windows. Therefore, we # require 0.3.4. - EXTERNAL("glog" "0.3.4" "${PROCESS_3RD_BIN}") + EXTERNAL("glog" "0.3.4" "${MESOS_3RDPARTY_BIN}") # NOTE: We expect cURL and zlib exist on Unix (usually pulled in with a # package manager), but Windows has no package manager, so we have to go # get it. - EXTERNAL("curl" ${CURL_VERSION} "${PROCESS_3RD_BIN}") + EXTERNAL("curl" ${CURL_VERSION} "${MESOS_3RDPARTY_BIN}") - EXTERNAL("zlib" ${ZLIB_VERSION} "${PROCESS_3RD_BIN}") + EXTERNAL("zlib" ${ZLIB_VERSION} "${MESOS_3RDPARTY_BIN}") endif (NOT WIN32) # Intermediate convenience variables for oddly-structured directories. @@ -51,7 +48,7 @@ set(LIBEV_LIB_ROOT ${LIBEV_ROOT}-lib/lib) set(LIBEVENT_LIB_ROOT ${LIBEVENT_ROOT}-lib/lib) # Convenience variables for include directories of third-party dependencies. -set(PROCESS_INCLUDE_DIR ${PROCESS_3RD_SRC}/../include) +set(PROCESS_INCLUDE_DIR ${MESOS_3RDPARTY_SRC}/libprocess/include) set(STOUT_INCLUDE_DIR ${STOUT}/include) set(BOOST_INCLUDE_DIR ${BOOST_ROOT}) http://git-wip-us.apache.org/repos/asf/mesos/blob/4beff1f1/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake index 83afd25..c73c7a4 100644 --- a/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake +++ b/3rdparty/libprocess/cmake/ProcessTestsConfigure.cmake @@ -37,11 +37,11 @@ set( # DIRECTORY STRUCTURE FOR THIRD-PARTY LIBS REQUIRED FOR TEST INFRASTRUCTURE. ############################################################################ -EXTERNAL("gmock" ${GMOCK_VERSION} "${PROCESS_3RD_BIN}") +EXTERNAL("gmock" ${GMOCK_VERSION} "${MESOS_3RDPARTY_BIN}") set(GTEST_SRC ${GMOCK_ROOT}/gtest) set(GPERFTOOLS_VERSION 2.0) -set(GPERFTOOLS ${PROCESS_3RD_BIN}/gperftools-${GPERFTOOLS_VERSION}) +set(GPERFTOOLS ${MESOS_3RDPARTY_BIN}/gperftools-${GPERFTOOLS_VERSION}) # Convenience variables for include directories of third-party dependencies. set(GMOCK_INCLUDE_DIR ${GMOCK_ROOT}/include) http://git-wip-us.apache.org/repos/asf/mesos/blob/4beff1f1/3rdparty/libprocess/cmake/macros/External.cmake ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/cmake/macros/External.cmake b/3rdparty/libprocess/cmake/macros/External.cmake index e3901b6..5bc51bd 100644 --- a/3rdparty/libprocess/cmake/macros/External.cmake +++ b/3rdparty/libprocess/cmake/macros/External.cmake @@ -22,7 +22,7 @@ # BOOST_VERSION (e.g., 1.53.0) # BOOST_TARGET (a target folder name to put dep in e.g., boost-1.53.0) # BOOST_CMAKE_ROOT (where to have CMake put the uncompressed source, e.g., -# build/3rdparty/libprocess/3rdparty/boost-1.53.0) +# build/3rdparty/boost-1.53.0) # BOOST_ROOT (where the code goes in various stages of build, e.g., # build/.../boost-1.53.0/src, which might contain folders # build-1.53.0-build, -lib, and so on, for each build step @@ -70,7 +70,7 @@ function(EXTERNAL ${TARGET_DATA} PARENT_SCOPE) - set(${CMAKE_ROOT_VAR} # e.g., build/3rdparty/libprocess/3rdparty/boost-1.53.0 + set(${CMAKE_ROOT_VAR} # e.g., build/3rdparty/boost-1.53.0 ${CMAKE_ROOT_DATA} PARENT_SCOPE)
