Remove benchmark from third-party, prefer deps-build

CMake/FindBenchmark.cmake

@@ -1,8 +0,0 @@
-set(BENCHMARK_SOURCE_DIR "${CMAKE_SOURCE_DIR}/third-party/benchmark")
-set(BENCHMARK_BUILD_DIR "${CMAKE_BINARY_DIR}/third-party/benchmark")
-
-# Only build the benchmark shared library for benchmark targets.
-set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "")
-
-INCLUDE_DIRECTORIES("${BENCHMARK_SOURCE_DIR}/include")
-ADD_SUBDIRECTORY("${BENCHMARK_SOURCE_DIR}")

CMakeLists.txt

@@ -316,7 +316,6 @@ endif()
 find_package(Glog REQUIRED)
 find_package(Gflags REQUIRED)
 find_package(Gtest REQUIRED)
-find_package(Benchmark REQUIRED)
 find_package(RocksDB REQUIRED)
 find_package(Sqlite3 REQUIRED)
 find_package(Thrift 0.9.1 REQUIRED)

third-party

@@ -1 +1 @@
-Subproject commit ed4482f5e563717d453b8a0f7e8531cce68e862e
+Subproject commit f5a91963fab9e7b1481c58d55671390e12ce7757

tools/provision/amazon.sh

@@ -69,6 +69,7 @@ function main_amazon() {
   install_thrift
   install_yara
   install_cppnetlib
+  install_google_benchmark
 
   gem_install fpm
 }

tools/provision/centos.sh

@@ -99,6 +99,7 @@ function main_centos() {
   install_thrift
   install_yara
   install_cppnetlib
+  install_google_benchmark
 
   package device-mapper-devel
   package libgcrypt-devel

tools/provision/darwin.sh

@@ -31,5 +31,6 @@ function main_darwin() {
   package yara
   package libressl
   package cpp-netlib
+  package google-benchmark
   package libmagic
 }

tools/provision/debian.sh

@@ -94,6 +94,7 @@ function main_debian() {
   install_rocksdb 
   install_yara
   install_cppnetlib
+  install_google_benchmark
   
   # Need headers and PC macros
   package libgcrypt-dev

tools/provision/fedora.sh

@@ -57,6 +57,7 @@ function main_fedora() {
   install_thrift
   install_yara
   install_cppnetlib
+  install_google_benchmark
 
   package device-mapper-devel
   package libgcrypt-devel

tools/provision/lib.sh

@@ -216,6 +216,23 @@ function install_gflags() {
   fi
 }
 
+function install_google_benchmark() {
+  SOURCE=benchmark-0.1.0
+  TARBALL=$SOURCE.tar.gz
+  URL=$DEPS_URL/$TARBALL
+
+  if provision benchmark /usr/local/lib/libbenchmark.a; then
+    pushd $SOURCE
+    mkdir -p build
+    pushd build
+    cmake -DCMAKE_CXX_FLAGS="$CFLAGS" ..
+    CC="$CC" CXX="$CXX" make -j $THREADS
+    sudo make install
+    popd
+    popd
+  fi
+}
+
 function install_iptables_dev() {
   SOURCE=iptables-1.4.21
   TARBALL=$SOURCE.tar.gz

tools/provision/oracle.sh

@@ -110,6 +110,7 @@ function main_oracle() {
   install_thrift
   install_yara
   install_cppnetlib
+  install_google_benchmark
 
   if [[ $DISTRO = "oracle5" ]]; then
     # Install python26 and pip from PyPA.

tools/provision/rhel.sh

@@ -137,6 +137,7 @@ function main_rhel() {
   install_thrift
   install_yara
   install_cppnetlib
+  install_google_benchmark
 
   package device-mapper-devel
   package libgcrypt-devel

tools/provision/ubuntu.sh

@@ -136,6 +136,7 @@ function main_ubuntu() {
   install_rocksdb
   install_yara
   install_cppnetlib
+  install_google_benchmark
 
   # Need headers and PC macros
   package libgcrypt-dev