Skip to content

[rocksdb] Add tbb support #5142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Codiferous merged 9 commits into from
Feb 11, 2019
Merged

[rocksdb] Add tbb support #5142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ab9dd11
Add tbb feature support to rocksdb to enable CLOCK algorithm
pgoodman Jan 13, 2019
f5ccc63
Merge pull request #1 from Microsoft/master
pgoodman Jan 13, 2019
8ff11c2
Merge branch 'master' of github.com:pgoodman/vcpkg
pgoodman Jan 13, 2019
97ed172
Merge pull request #2 from Microsoft/master
pgoodman Jan 15, 2019
1fc470b
Merge pull request #3 from Microsoft/master
pgoodman Jan 22, 2019
30632cd
Use RocksDB master branch.
pgoodman Jan 22, 2019
27295d8
Undid RocksDB head requirement.
pgoodman Feb 4, 2019
597cb27
Merge branch 'master' into dev/codym/5142
Nostracodus Feb 7, 2019
3195683
fix: remove unnecessary FindTbb.cmake
Nostracodus Feb 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions ports/rocksdb/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 10 additions & 1 deletion ports/rocksdb/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down