Merge pull request #1182 from grooverdan/10.4-friendlier-wsrep-message

cmake-wsrep: friendly error message about missing wsrep_api.h

Author: Jan Lindström

cmake/submodules.cmake

@@ -31,7 +31,7 @@ ENDIF()
 
 IF(update_result OR NOT EXISTS ${CMAKE_SOURCE_DIR}/libmariadb/CMakeLists.txt)
   MESSAGE(FATAL_ERROR "No MariaDB Connector/C! Run
-    git submodule update --init
+    git submodule update --init --recursive
 Then restart the build.
 ")
 ENDIF()

cmake/wsrep.cmake

@@ -32,6 +32,12 @@ IF(WITH_WSREP)
   # Set the patch version
   SET(WSREP_PATCH_VERSION "22")
 
+  IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/wsrep-lib/wsrep-API/v26/wsrep_api.h")
+    MESSAGE(FATAL_ERROR "No MariaDB wsrep-API code! Run
+    ${GIT_EXECUTABLE} submodule update --init --recursive
+Then restart the build.
+")
+  ENDIF()
   # Obtain wsrep API version
   FILE(STRINGS "${CMAKE_SOURCE_DIR}/wsrep-lib/wsrep-API/v26/wsrep_api.h" WSREP_API_VERSION
        LIMIT_COUNT 1 REGEX "WSREP_INTERFACE_VERSION")