Added concurrentqueue to CMake build.

Review: https://reviews.apache.org/r/60987/
YugandhaD · Jul 20, 2017 · 696f9ec · 696f9ec
1 parent 8371869
commit 696f9ec
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 33 deletions.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -30,13 +30,14 @@ endif ()
 # Downloads, configures, and compiles the third-party libraries for the process
 # library (located in `3rdparty/`, i.e. not the `mesos-3rdparty` repository).
 ###############################################################################
-set(BOOST_URL       ${FETCH_URL}/boost-${BOOST_VERSION}.tar.gz)
-set(ELFIO_URL       ${FETCH_URL}/elfio-${ELFIO_VERSION}.tar.gz)
-set(GLOG_URL        ${FETCH_URL}/glog-${GLOG_VERSION}.tar.gz)
-set(HTTP_PARSER_URL ${FETCH_URL}/http-parser-${HTTP_PARSER_VERSION}.tar.gz)
-set(PICOJSON_URL    ${FETCH_URL}/picojson-${PICOJSON_VERSION}.tar.gz)
-set(NVML_URL        ${FETCH_URL}/nvml-${NVML_VERSION}.tar.gz)
-set(LIBEV_URL       ${FETCH_URL}/libev-${LIBEV_VERSION}.tar.gz)
+set(BOOST_URL           ${FETCH_URL}/boost-${BOOST_VERSION}.tar.gz)
+set(CONCURRENTQUEUE_URL ${FETCH_URL}/concurrentqueue-${CONCURRENTQUEUE_VERSION}.tar.gz)
+set(ELFIO_URL           ${FETCH_URL}/elfio-${ELFIO_VERSION}.tar.gz)
+set(GLOG_URL            ${FETCH_URL}/glog-${GLOG_VERSION}.tar.gz)
+set(HTTP_PARSER_URL     ${FETCH_URL}/http-parser-${HTTP_PARSER_VERSION}.tar.gz)
+set(PICOJSON_URL        ${FETCH_URL}/picojson-${PICOJSON_VERSION}.tar.gz)
+set(NVML_URL            ${FETCH_URL}/nvml-${NVML_VERSION}.tar.gz)
+set(LIBEV_URL           ${FETCH_URL}/libev-${LIBEV_VERSION}.tar.gz)
 
 # NOTE: libevent doesn't come rebundled, so this URL is always the same. But,
 # it's only downloaded if `ENABLE_LIBEVENT` is set.
@@ -182,6 +183,16 @@ ExternalProject_Add(
   URL_HASH          ${BOOST_HASH}
   )
 
+ExternalProject_Add(
+  ${CONCURRENTQUEUE_TARGET}
+  PREFIX            ${CONCURRENTQUEUE_CMAKE_ROOT}
+  CONFIGURE_COMMAND ${CMAKE_NOOP}
+  BUILD_COMMAND     ${CMAKE_NOOP}
+  INSTALL_COMMAND   ${CMAKE_NOOP}
+  URL               ${CONCURRENTQUEUE_URL}
+  URL_HASH          ${CONCURRENTQUEUE_HASH}
+  )
+
 ExternalProject_Add(
   ${ELFIO_TARGET}
   PREFIX            ${ELFIO_CMAKE_ROOT}

diff --git a/3rdparty/cmake/Versions.cmake b/3rdparty/cmake/Versions.cmake
@@ -1,30 +1,32 @@
-set(BOOST_VERSION       "1.53.0")
-set(BOOST_HASH          "SHA256=CED7CE2ED8D7D34815AC9DB1D18D28FCD386FFBB3DE6DA45303E1CF193717038")
-set(CURL_VERSION        "7.43.0")
-set(CURL_HASH           "SHA256=1A084DA1EDBFC3BD632861358B26AF45BA91AAADFB15D6482DE55748B8DFC693")
-set(ELFIO_VERSION       "3.2")
-set(ELFIO_HASH          "SHA256=964BE1D401F98FA7A1242BCF048DF32B7D56DBAAAE5D02834900499073AC2E95")
-set(GOOGLETEST_VERSION  "1.8.0")
-set(GOOGLETEST_HASH     "SHA256=58A6F4277CA2BC8565222B3BBD58A177609E9C488E8A72649359BA51450DB7D8")
-set(HTTP_PARSER_VERSION "2.6.2")
-set(HTTP_PARSER_HASH    "SHA256=80FFFC3B64EF6968CECDD4B299A96986007DFF4BD12AE6C58CBCB506959B90AD")
-set(LEVELDB_VERSION     "1.19")
-set(LEVELDB_HASH        "SHA256=7D7A14AE825E66AABEB156C1C3FAE9F9A76D640EF6B40EDE74CC73DA937E5202")
-set(LIBAPR_VERSION      "1.5.2")
-set(LIBAPR_HASH         "SHA256=C173DE748F85A76B5EA7E5C77F3D9F1EECC9C0A6AB91239973062122EA7DD597")
-set(LIBEV_VERSION       "4.22")
-set(LIBEV_HASH          "SHA256=736079E8AC543C74D59AF73F9C52737B3BFEC9601F020BF25A87A4F4D0F01BD6")
+set(BOOST_VERSION           "1.53.0")
+set(BOOST_HASH              "SHA256=CED7CE2ED8D7D34815AC9DB1D18D28FCD386FFBB3DE6DA45303E1CF193717038")
+set(CONCURRENTQUEUE_VERSION "1.0.0-beta")
+set(CONCURRENTQUEUE_HASH    "SHA256=D723E784E4D54F7519208BD795F2AA799A449B873DBB7A1251F288E04BE23465")
+set(CURL_VERSION            "7.43.0")
+set(CURL_HASH               "SHA256=1A084DA1EDBFC3BD632861358B26AF45BA91AAADFB15D6482DE55748B8DFC693")
+set(ELFIO_VERSION           "3.2")
+set(ELFIO_HASH              "SHA256=964BE1D401F98FA7A1242BCF048DF32B7D56DBAAAE5D02834900499073AC2E95")
+set(GOOGLETEST_VERSION      "1.8.0")
+set(GOOGLETEST_HASH         "SHA256=58A6F4277CA2BC8565222B3BBD58A177609E9C488E8A72649359BA51450DB7D8")
+set(HTTP_PARSER_VERSION     "2.6.2")
+set(HTTP_PARSER_HASH        "SHA256=80FFFC3B64EF6968CECDD4B299A96986007DFF4BD12AE6C58CBCB506959B90AD")
+set(LEVELDB_VERSION         "1.19")
+set(LEVELDB_HASH            "SHA256=7D7A14AE825E66AABEB156C1C3FAE9F9A76D640EF6B40EDE74CC73DA937E5202")
+set(LIBAPR_VERSION          "1.5.2")
+set(LIBAPR_HASH             "SHA256=C173DE748F85A76B5EA7E5C77F3D9F1EECC9C0A6AB91239973062122EA7DD597")
+set(LIBEV_VERSION           "4.22")
+set(LIBEV_HASH              "SHA256=736079E8AC543C74D59AF73F9C52737B3BFEC9601F020BF25A87A4F4D0F01BD6")
 # TODO(hausdorff): (MESOS-3529) transition this back to a non-beta version.
-set(LIBEVENT_VERSION    "2.1.5-beta")
-set(LIBEVENT_HASH       "SHA256=9A410E24921F59F0AB2009E5E31B3B20932E4AA5A1CBAC6A53190DC86DADE806")
-set(NVML_VERSION        "352.79")
-set(NVML_HASH           "SHA256=D0B2CC1742CBD7CC73DA13BFA6BF2DA3D92B545E8388E642D41977F4EAD8D3D0")
-set(PICOJSON_VERSION    "1.3.0")
-set(PICOJSON_HASH       "SHA256=056805CA2691798F5545935A14BB477F2E1D827C9FB862E6E449DBEA22801C7D")
-set(PROTOBUF_VERSION    "3.3.0")
-set(PROTOBUF_HASH       "SHA256=E43F47C51C4A838F737EE2DA2F183F129EE388272622C403179D5AD28C555F39")
-set(ZLIB_VERSION        "1.2.8")
-set(ZLIB_HASH           "SHA256=36658CB768A54C1D4DEC43C3116C27ED893E88B02ECFCB44F2166F9C0B7F2A0D")
+set(LIBEVENT_VERSION        "2.1.5-beta")
+set(LIBEVENT_HASH           "SHA256=9A410E24921F59F0AB2009E5E31B3B20932E4AA5A1CBAC6A53190DC86DADE806")
+set(NVML_VERSION            "352.79")
+set(NVML_HASH               "SHA256=D0B2CC1742CBD7CC73DA13BFA6BF2DA3D92B545E8388E642D41977F4EAD8D3D0")
+set(PICOJSON_VERSION        "1.3.0")
+set(PICOJSON_HASH           "SHA256=056805CA2691798F5545935A14BB477F2E1D827C9FB862E6E449DBEA22801C7D")
+set(PROTOBUF_VERSION        "3.3.0")
+set(PROTOBUF_HASH           "SHA256=E43F47C51C4A838F737EE2DA2F183F129EE388272622C403179D5AD28C555F39")
+set(ZLIB_VERSION            "1.2.8")
+set(ZLIB_HASH               "SHA256=36658CB768A54C1D4DEC43C3116C27ED893E88B02ECFCB44F2166F9C0B7F2A0D")
 
 # Platform-dependent versions.
 if (NOT WIN32)

diff --git a/cmake/CompilationConfigure.cmake b/cmake/CompilationConfigure.cmake
@@ -78,6 +78,11 @@ option(
   "Build libprocess with SSL support"
   FALSE)
 
+option(
+  ENABLE_LOCK_FREE_RUN_QUEUE
+  "Build libprocess with lock free run queue"
+  FALSE)
+
 option(
   HAS_AUTHENTICATION
   "Build Mesos against authentication libraries"