From bd8dbb87b6fbc5dd17563b475d65ac4efb1b0aad Mon Sep 17 00:00:00 2001 From: Miguel Portilla Date: Tue, 14 Apr 2020 16:09:33 -0400 Subject: [PATCH] Update to RocksBD 6.7.3 --- .travis.yml | 8 ++------ Builds/CMake/deps/Rocksdb.cmake | 6 +++--- bin/sh/setup-msvc.sh | 6 ------ 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 16fb283c3..311311567 100644 --- a/.travis.yml +++ b/.travis.yml @@ -344,9 +344,7 @@ matrix: install: - choco upgrade cmake.install - choco install ninja visualstudio2017-workload-vctools -y - #Force install 14.24 to fix build issue. TODO - this should be deleted when rocksdb fixes their issue with the new compiler. - - choco install visualstudio2019buildtools visualstudio2019community -y - - choco install visualstudio2019-workload-vctools --package-parameters "--add Microsoft.VisualStudio.Component.VC.14.24.x86.x64" -y + - choco install visualstudio2019buildtools visualstudio2019community visualstudio2019-workload-vctools -y script: - export BOOST_TOOLSET=msvc-14.1 - travis_wait ${MAX_TIME_MIN} Builds/containers/shared/install_boost.sh @@ -385,9 +383,7 @@ matrix: install: - choco upgrade cmake.install - choco install ninja -y - #Force install 14.24 to fix build issue. TODO - this should be deleted when rocksdb fixes their issue with the new compiler. - - choco install visualstudio2019buildtools visualstudio2019community -y - - choco install visualstudio2019-workload-vctools --package-parameters "--add Microsoft.VisualStudio.Component.VC.14.24.x86.x64" -y + - choco install visualstudio2019buildtools visualstudio2019community visualstudio2019-workload-vctools -y before_script: - export BLD_CONFIG=Release # we want to use the boost build from cache, which was built using the diff --git a/Builds/CMake/deps/Rocksdb.cmake b/Builds/CMake/deps/Rocksdb.cmake index f7979c82a..f61cab3f7 100644 --- a/Builds/CMake/deps/Rocksdb.cmake +++ b/Builds/CMake/deps/Rocksdb.cmake @@ -8,7 +8,7 @@ set_target_properties (rocksdb_lib option (local_rocksdb "use local build of rocksdb." OFF) if (NOT local_rocksdb) - find_package (RocksDB 6.5 QUIET CONFIG) + find_package (RocksDB 6.7 QUIET CONFIG) if (TARGET RocksDB::rocksdb) message (STATUS "Found RocksDB using config.") get_target_property (_rockslib_l RocksDB::rocksdb IMPORTED_LOCATION_DEBUG) @@ -40,7 +40,7 @@ if (NOT local_rocksdb) # TBD if there is some way to extract transitive deps..then: #set (RocksDB_USE_STATIC ON) else () - find_package (RocksDB 6.5 MODULE) + find_package (RocksDB 6.7 MODULE) if (ROCKSDB_FOUND) if (RocksDB_LIBRARY_DEBUG) set_target_properties (rocksdb_lib PROPERTIES IMPORTED_LOCATION_DEBUG ${RocksDB_LIBRARY_DEBUG}) @@ -60,7 +60,7 @@ if (local_rocksdb) ExternalProject_Add (rocksdb PREFIX ${nih_cache_path} GIT_REPOSITORY https://github.com/facebook/rocksdb.git - GIT_TAG v6.5.3 + GIT_TAG v6.7.3 PATCH_COMMAND # only used by windows build ${CMAKE_COMMAND} -E copy diff --git a/bin/sh/setup-msvc.sh b/bin/sh/setup-msvc.sh index f4a012244..8d61c9757 100755 --- a/bin/sh/setup-msvc.sh +++ b/bin/sh/setup-msvc.sh @@ -22,10 +22,6 @@ while read line ; do fi fi done <