ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-11-04 10:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add dependency for NuDB ExternalProject

Browse Source
This commit is contained in:
Mike Ellery
2018-10-03 08:42:44 -07:00
committed by seelabs
parent 0bbe6e226c
commit d70464032c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -1158,6 +1158,7 @@ target_link_libraries (ripple_libs INTERFACE NIH::rocksdb)
proper targets and export/install
#]===================================================================]
add_library (nudb INTERFACE)
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.11)
FetchContent_Declare(
nudb_src
@@ -1182,9 +1183,9 @@ else ()
ExternalProject_Get_Property (nudb_src SOURCE_DIR)
set (nudb_src_SOURCE_DIR "${SOURCE_DIR}")
file (MAKE_DIRECTORY ${nudb_src_SOURCE_DIR}/include)
add_dependencies (nudb nudb_src)
endif ()
add_library (nudb INTERFACE)
file(TO_CMAKE_PATH "${nudb_src_SOURCE_DIR}" nudb_src_SOURCE_DIR)
# specify as system includes so as to avoid warnings
target_include_directories (nudb SYSTEM INTERFACE ${nudb_src_SOURCE_DIR}/include)

2
Jenkinsfile vendored
View File

@@ -701,7 +701,7 @@ function error {
exit 1
}
yum install -y yum-utils
yum install -y yum-utils openssl-static zlib-static
rpm -i /opt/rippled-rpm/*.rpm
rc=$?; if [[ $rc != 0 ]]; then
error "error installing rpms"