Commit graph

9 commits

Author SHA1 Message Date
Oleksandr Byelkin
93ac7ae70f Merge branch '10.3' into 10.4 2019-02-21 14:40:52 +01:00
Laurynas Biveinis
43a7409bb8
typo cmake/submodules.cmake
Co-Authored-By: grooverdan <daniel@linux.ibm.com>
2019-02-13 17:48:12 +11:00
Daniel Black
4f5c65367a cmake-wsrep: friendly error message about missing wsrep_api.h
Without this commit the error message is:

$ cmake . -DWITH_WSREP=ON
-- Running cmake version 3.12.1
-- MariaDB 10.4.3
CMake Error at cmake/wsrep.cmake:36 (FILE):
  FILE STRINGS file
  ".../mariadb-server-10.4/wsrep-lib/wsrep-API/v26/wsrep_api.h"
  cannot be read.
Call Stack (most recent call first):
  CMakeLists.txt:147 (INCLUDE)

Having 'git config cmake.update-submodules yes' nicely updates the
build without error.

$ cmake . -DWITH_WSREP=ON
-- Running cmake version 3.12.1
-- MariaDB 10.4.3
Submodule path 'wsrep-lib': checked out 'e7d72ae7f6a6995a21d743389426a963429a1fff'
Submodule path 'wsrep-lib/wsrep-API/v26': checked out '75a5f452f2ba07b0f4a3a9a94825fccc71b27398'
2019-02-13 11:36:03 +11:00
Daniel Black
17c3f147f8 cmake/submodules: notify user about gitconfig for automatic update 2019-02-13 11:26:08 +11:00
Brave Galera Crew
36a2a185fe Galera4 2019-01-23 15:30:00 +04:00
Vladislav Vaintroub
f67e050430 Update libmariadb 2018-10-03 14:29:16 +01:00
Sergei Golubchik
8b1f145c82 cleanup
Item_func_format::print() was redundant
and other changes
2017-09-18 10:12:23 +02:00
Daniel Black
acaac7c233 submodules.cmake: git returns 128 if not in a repository
It is possible that a .git directory isn't definitive on the
existance of a working git tree. A git worktree over sshfs
for instance will fail to build unless the main repository
also exists in the same directory. Adding this extra test
will make the detection that little more ruggardised for these
odd build environments.

Signed-off-by: Daniel Black <daniel.black@au.ibm.com>
2017-08-29 22:50:16 +04:00
Sergei Golubchik
c9db190fed cmake: update submodules automatically during the build 2017-08-14 19:45:58 +02:00