1
0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-28 20:02:00 +03:00

Added wsrep-API/v26 submodule which will point to correct branch

of current wsrep-API v26 version.
This commit is contained in:
Teemu Ollakka
2018-06-05 12:45:25 +03:00
parent d3cb537d1e
commit 15f483ca7f
5 changed files with 15 additions and 3 deletions

4
.gitmodules vendored
View File

@ -1,3 +1,7 @@
[submodule "wsrep"] [submodule "wsrep"]
path = wsrep path = wsrep
url = git@github.com:codership/wsrep-API.git url = git@github.com:codership/wsrep-API.git
[submodule "wsrep-API/v26"]
path = wsrep-API/v26
url = https://github.com/codership/wsrep-API.git
branch = "wsrep-API#20"

View File

@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror -Weffc++ -Woverloa
check_include_file("${CMAKE_CURRENT_SOURCE_DIR}/wsrep/wsrep_api.h" HAVE_WSREP_API_HPP) check_include_file("${CMAKE_CURRENT_SOURCE_DIR}/wsrep/wsrep_api.h" HAVE_WSREP_API_HPP)
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/wsrep") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/wsrep-API/v26")
link_directories("${CMAKE_CURRENT_SOURCE_DIR}/wsrep") link_directories("${CMAKE_CURRENT_SOURCE_DIR}/wsrep")
@ -52,5 +52,5 @@ if (WITH_DOCUMENTATION)
endif() endif()
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(wsrep) add_subdirectory(wsrep-API)

View File

@ -11,7 +11,7 @@ add_library(wsrep-lib
server_context.cpp server_context.cpp
transaction_context.cpp transaction_context.cpp
wsrep_provider_v26.cpp) wsrep_provider_v26.cpp)
target_link_libraries(wsrep-lib wsrep pthread dl) target_link_libraries(wsrep-lib wsrep_api_v26 pthread dl)
add_executable(wsrep-lib_test add_executable(wsrep-lib_test
mock_client_context.cpp mock_client_context.cpp

7
wsrep-API/CMakeLists.txt Normal file
View File

@ -0,0 +1,7 @@
add_library(wsrep_api_v26
v26/wsrep_dummy.c
v26/wsrep_gtid.c
v26/wsrep_loader.c
v26/wsrep_uuid.c
)

1
wsrep-API/v26 Submodule

Submodule wsrep-API/v26 added at 7b2ee90d67