CMake:[1/2] Added support for new 3rdparty/ directory structure.

Review: https://reviews.apache.org/r/47284/
markeijsermans · May 12, 2016 · 4beff1f · 4beff1f
1 parent a5ce87b
commit 4beff1f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 331 deletions.
diff --git a/3rdparty/libprocess/3rdparty/CMakeLists.txt b/3rdparty/libprocess/3rdparty/CMakeLists.txt
diff --git 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)

diff --git 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})

diff --git 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)