-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Bump nuraft to latest HEAD.
- Loading branch information
Showing
5 changed files
with
190 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| sources: | ||
| "2.4.0": | ||
| url: "https://github.com/eBay/nuraft/archive/929132f5a0e86ab3070055c63b485a512f82bcb0.tar.gz" | ||
| sha256: "8894be82d396fe3b8eb3ed6e03e65e398c81779bf8c1f8e2345530f8e80da5b3" | ||
| "2.3.0": | ||
| url: "https://github.com/eBay/nuraft/archive/f42b12c3ec9f20a085de61e1294e8167fa747c7d.tar.gz" | ||
| patches: | ||
| "2.4.0": | ||
| - patch_file: "patches/2-4-0.patch" | ||
| patch_description: "Dependency discovery" | ||
| patch_type: "conan" | ||
| "2.3.0": | ||
| - patch_file: "patches/patch.diff" | ||
| patch_description: "Dependency discovery" | ||
| patch_type: "conan" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| diff -Naur a/CMakeLists.txt b/CMakeLists.txt | ||
| --- a/CMakeLists.txt 2024-05-06 13:23:42.000000000 -0700 | ||
| +++ b/CMakeLists.txt 2024-05-07 10:13:57.568884730 -0700 | ||
| @@ -1,5 +1,6 @@ | ||
| cmake_minimum_required(VERSION 3.5) | ||
| project(NuRaft VERSION 1.0.0 LANGUAGES CXX) | ||
| +set (CMAKE_CXX_STANDARD 11) | ||
|
|
||
| # === Build type (default: RelWithDebInfo, O2) =========== | ||
| if (NOT CMAKE_BUILD_TYPE) | ||
| @@ -26,41 +27,23 @@ | ||
|
|
||
|
|
||
| # === Find ASIO === | ||
| -if (BOOST_INCLUDE_PATH AND BOOST_LIBRARY_PATH) | ||
| +find_package(OpenSSL CONFIG REQUIRED) | ||
| +find_package(Boost CONFIG) | ||
| +if (Boost_FOUND) | ||
| # If Boost path (both include and library) is given, | ||
| # use Boost's ASIO. | ||
| - message(STATUS "Boost include path: " ${BOOST_INCLUDE_PATH}) | ||
| - message(STATUS "Boost library path: " ${BOOST_LIBRARY_PATH}) | ||
| - | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUSE_BOOST_ASIO") | ||
| - | ||
| - set(ASIO_INCLUDE_DIR ${BOOST_INCLUDE_PATH}) | ||
| - set(LIBBOOST_SYSTEM "${BOOST_LIBRARY_PATH}/libboost_system.a") | ||
| - | ||
| + set(ASIO_DEP boost::boost) | ||
| else () | ||
| # If not, ASIO standalone mode. | ||
| - FIND_PATH(ASIO_INCLUDE_DIR | ||
| - NAME asio.hpp | ||
| - HINTS ${PROJECT_SOURCE_DIR}/asio/asio/include | ||
| - $ENV{HOME}/local/include | ||
| - /opt/local/include | ||
| - /usr/local/include | ||
| - /usr/include) | ||
| - | ||
| + find_package(Asio CONFIG REQUIRED) | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DASIO_STANDALONE") | ||
| - | ||
| -endif () | ||
| - | ||
| -if (NOT ASIO_INCLUDE_DIR) | ||
| - message(FATAL_ERROR "Can't find ASIO header files") | ||
| -else () | ||
| - message(STATUS "ASIO include path: " ${ASIO_INCLUDE_DIR}) | ||
| + set(ASIO_DEP asio::asio) | ||
| endif () | ||
|
|
||
|
|
||
| # === Includes === | ||
| include_directories(BEFORE ./) | ||
| -include_directories(BEFORE ${ASIO_INCLUDE_DIR}) | ||
| include_directories(BEFORE ${PROJECT_SOURCE_DIR}/include) | ||
| include_directories(BEFORE ${PROJECT_SOURCE_DIR}/include/libnuraft) | ||
| include_directories(BEFORE ${PROJECT_SOURCE_DIR}/examples) | ||
| @@ -82,24 +65,11 @@ | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-pessimizing-move") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") | ||
| - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") | ||
| - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g") | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") | ||
| - if (APPLE) | ||
| -# include_directories(BEFORE | ||
| -# /usr/local/opt/openssl/include | ||
| -# ) | ||
| -# link_directories( | ||
| -# /usr/local/opt/openssl/lib | ||
| -# ) | ||
| - else() | ||
| - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") | ||
| - endif () | ||
|
|
||
| else () | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd5045 /wd4571 /wd4774 /wd4820 /wd5039 /wd4626 /wd4625 /wd5026 /wd5027 /wd4623 /wd4996 /wd4530 /wd4267 /wd4244 /W3") | ||
| message(STATUS "---- WIN32 ----") | ||
| - set(DISABLE_SSL 1) | ||
| endif () | ||
|
|
||
| # === Disable SSL === | ||
| @@ -264,6 +234,7 @@ | ||
| ${ROOT_SRC}/stat_mgr.cxx | ||
| ) | ||
| add_library(RAFT_CORE_OBJ OBJECT ${RAFT_CORE}) | ||
| +target_link_libraries(RAFT_CORE_OBJ ${ASIO_DEP} openssl::openssl) | ||
|
|
||
| set(STATIC_LIB_SRC | ||
| $<TARGET_OBJECTS:RAFT_CORE_OBJ>) | ||
| @@ -271,70 +242,11 @@ | ||
| # === Executables === | ||
| set(LIBRARY_NAME "nuraft") | ||
|
|
||
| -add_library(static_lib ${STATIC_LIB_SRC}) | ||
| -add_library(NuRaft::static_lib ALIAS static_lib) | ||
| -set_target_properties(static_lib PROPERTIES OUTPUT_NAME ${LIBRARY_NAME} CLEAN_DIRECT_OUTPUT 1) | ||
| - | ||
| -add_library(shared_lib SHARED ${STATIC_LIB_SRC}) | ||
| -add_library(NuRaft::shared_lib ALIAS shared_lib) | ||
| -set_target_properties(shared_lib PROPERTIES OUTPUT_NAME ${LIBRARY_NAME} CLEAN_DIRECT_OUTPUT 1) | ||
| - | ||
| -# Include directories are necessary for dependents to use the targets. | ||
| -target_include_directories(static_lib | ||
| - PUBLIC | ||
| - $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> | ||
| - $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include> | ||
| -) | ||
| - | ||
| -target_include_directories(static_lib | ||
| - PUBLIC | ||
| - $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include> | ||
| - $<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include> | ||
| -) | ||
| - | ||
| -if (APPLE) | ||
| - target_link_libraries(shared_lib ${LIBRARIES}) | ||
| -endif () | ||
| - | ||
| -if (WIN32) | ||
| - set(LIBRARY_OUTPUT_NAME "${LIBRARY_NAME}.lib") | ||
| -else () | ||
| - set(LIBRARY_OUTPUT_NAME "lib${LIBRARY_NAME}.a") | ||
| -endif () | ||
| -message(STATUS "Output library file name: ${LIBRARY_OUTPUT_NAME}") | ||
| - | ||
| -# === Examples === | ||
| -add_subdirectory("${PROJECT_SOURCE_DIR}/examples") | ||
| - | ||
| - | ||
| -# === Tests === | ||
| -add_subdirectory("${PROJECT_SOURCE_DIR}/tests") | ||
| - | ||
| - | ||
| -if (CODE_COVERAGE GREATER 0) | ||
| - set(CODE_COVERAGE_DEPS | ||
| - raft_server_test | ||
| - failure_test | ||
| - asio_service_test | ||
| - buffer_test | ||
| - serialization_test | ||
| - timer_test | ||
| - strfmt_test | ||
| - stat_mgr_test | ||
| - logger_test | ||
| - ) | ||
| - | ||
| - # lcov | ||
| - SETUP_TARGET_FOR_COVERAGE( | ||
| - NAME raft_cov | ||
| - EXECUTABLE ./runtests.sh | ||
| - DEPENDENCIES ${CODE_COVERAGE_DEPS} | ||
| - ) | ||
| -endif() | ||
| - | ||
| +add_library(nuraft ${STATIC_LIB_SRC}) | ||
| +target_link_libraries(nuraft ${ASIO_DEP} openssl::openssl) | ||
|
|
||
| # === Install Targets === | ||
| -install(TARGETS shared_lib static_lib | ||
| +install(TARGETS nuraft | ||
| EXPORT nuraft-targets | ||
| LIBRARY DESTINATION lib | ||
| ARCHIVE DESTINATION lib |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters