From 477ba33fbf421ad5f77d3b3448b23abace576ab1 Mon Sep 17 00:00:00 2001 From: Peter Goodman Date: Mon, 11 Feb 2019 17:47:17 -0500 Subject: [PATCH] [rocksdb] Add tbb support (#5142) * Add tbb feature support to rocksdb to enable CLOCK algorithm * Use RocksDB master branch. * Undid RocksDB head requirement. * fix: remove unnecessary FindTbb.cmake --- ports/rocksdb/CONTROL | 4 ++++ ports/rocksdb/portfile.cmake | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL index 94bcc35fd05..8ec367068cf 100644 --- a/ports/rocksdb/CONTROL +++ b/ports/rocksdb/CONTROL @@ -14,3 +14,7 @@ Description: snappy support in rocksdb Feature: zlib Build-Depends: zlib Description: zlib support in rocksdb + +Feature: tbb +Build-Depends: tbb +Description: tbb support in rocksdb diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake index 5f19e0a8874..202ef61a850 100644 --- a/ports/rocksdb/portfile.cmake +++ b/ports/rocksdb/portfile.cmake @@ -39,6 +39,14 @@ if("zlib" IN_LIST FEATURES) set(WITH_ZLIB ON) endif() +set(WITH_TBB OFF) +set(ROCKSDB_IGNORE_PACKAGE_TBB TRUE) +if("tbb" IN_LIST FEATURES) + set(WITH_TBB ON) + set(ROCKSDB_IGNORE_PACKAGE_TBB FALSE) +endif() + + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -47,6 +55,7 @@ vcpkg_configure_cmake( -DWITH_SNAPPY=${WITH_SNAPPY} -DWITH_LZ4=${WITH_LZ4} -DWITH_ZLIB=${WITH_ZLIB} + -DWITH_TBB=${WITH_TBB} -DWITH_TESTS=OFF -DUSE_RTTI=1 -DROCKSDB_INSTALL_ON_WINDOWS=ON @@ -56,7 +65,7 @@ vcpkg_configure_cmake( -DCMAKE_DEBUG_POSTFIX=d -DROCKSDB_DISABLE_INSTALL_SHARED_LIB=${ROCKSDB_DISABLE_INSTALL_SHARED_LIB} -DROCKSDB_DISABLE_INSTALL_STATIC_LIB=${ROCKSDB_DISABLE_INSTALL_STATIC_LIB} - -DCMAKE_DISABLE_FIND_PACKAGE_TBB=TRUE + -DCMAKE_DISABLE_FIND_PACKAGE_TBB=${ROCKSDB_IGNORE_PACKAGE_TBB} -DCMAKE_DISABLE_FIND_PACKAGE_NUMA=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_gtest=TRUE -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE