dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Update Rocksdb to v8.6.7. Convert setting of CMake variable PORTABLE to use 0/1 instead of OFF/ON. Reenable fail on warnings.

Browse source
This commit is contained in:
Colin LeMahieu 2023-10-31 09:58:25 +00:00
commit ad0340527c
No known key found for this signature in database
GPG key ID: 43708520C8DFB938
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -491,18 +491,13 @@ set(WITH_TOOLS
CACHE BOOL "" FORCE) CACHE BOOL "" FORCE)
if(ENABLE_AVX2) if(ENABLE_AVX2)
set(PORTABLE set(PORTABLE
OFF 0
CACHE BOOL "" FORCE) CACHE BOOL "" FORCE)
else() else()
set(PORTABLE set(PORTABLE
ON 1
CACHE BOOL "" FORCE) CACHE BOOL "" FORCE)
endif() endif()
set(FAIL_ON_WARNINGS
OFF
CACHE BOOL "") # Ignore unreachable code warning in merging_iterator.cc
# RocksDB v7.8.3 on Windows
# https://github.com/facebook/rocksdb/issues/11072
add_subdirectory(submodules/rocksdb EXCLUDE_FROM_ALL) add_subdirectory(submodules/rocksdb EXCLUDE_FROM_ALL)
include_directories(cpptoml/include) include_directories(cpptoml/include)

2
submodules/rocksdb

@ -1 +1 @@
Subproject commit bf2c335184de16a3cc1787fa97ef9f22f7114238 Subproject commit cb7a5e02edeb883193eb5b4901d5943f58e9add9