From 15f483ca7fb51e089b76473a435401e830a460a3 Mon Sep 17 00:00:00 2001
From: Teemu Ollakka <teemu.ollakka@galeracluster.com>
Date: Tue, 5 Jun 2018 12:45:25 +0300
Subject: [PATCH] Added wsrep-API/v26 submodule which will point to correct
 branch of current wsrep-API v26 version.

---
 .gitmodules              | 4 ++++
 CMakeLists.txt           | 4 ++--
 src/CMakeLists.txt       | 2 +-
 wsrep-API/CMakeLists.txt | 7 +++++++
 wsrep-API/v26            | 1 +
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 wsrep-API/CMakeLists.txt
 create mode 160000 wsrep-API/v26

diff --git a/.gitmodules b/.gitmodules
index 260be8d..15bedcf 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,7 @@
 [submodule "wsrep"]
 	path = wsrep
 	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"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8475f94..cd7b194 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
 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")
 
 
@@ -52,5 +52,5 @@ if (WITH_DOCUMENTATION)
 endif()
 
 add_subdirectory(src)
-add_subdirectory(wsrep)
+add_subdirectory(wsrep-API)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 20388ad..0d55235 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,7 +11,7 @@ add_library(wsrep-lib
   server_context.cpp
   transaction_context.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
   mock_client_context.cpp
diff --git a/wsrep-API/CMakeLists.txt b/wsrep-API/CMakeLists.txt
new file mode 100644
index 0000000..a0259aa
--- /dev/null
+++ b/wsrep-API/CMakeLists.txt
@@ -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
+)
+
diff --git a/wsrep-API/v26 b/wsrep-API/v26
new file mode 160000
index 0000000..7b2ee90
--- /dev/null
+++ b/wsrep-API/v26
@@ -0,0 +1 @@
+Subproject commit 7b2ee90d67a80f15f16ab95184bfabe1b2a338b3