mirror of
https://github.com/MariaDB/server.git
synced 2026-05-17 20:37:12 +02:00
Merge commit '10.4' into 10.5
This commit is contained in:
commit
f52954ef42
310 changed files with 5831 additions and 7026 deletions
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
# https://buildbot.askmonty.org/buildbot/builders/work-amd64-valgrind/builds/5263/steps/compile/logs/stdio
|
||||
# says CMake 2.6.2... We want to drop old software support...
|
||||
cmake_minimum_required(VERSION 2.6.2)
|
||||
cmake_minimum_required(VERSION 2.8.12)
|
||||
# cmake_minimum_required(VERSION 2.6.4) # CentOS 5
|
||||
set(GRN_PROJECT_NAME "groonga")
|
||||
set(GRN_PROJECT_LABEL "Groonga")
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
|
||||
# MA 02110-1335 USA
|
||||
|
||||
cmake_minimum_required(VERSION 2.6)
|
||||
cmake_minimum_required(VERSION 2.8.12)
|
||||
if(NOT DEFINED GROONGA_NORMALIZER_MYSQL_PROJECT_NAME)
|
||||
set(GROONGA_NORMALIZER_MYSQL_PROJECT_NAME "groonga-normalizer-mysql")
|
||||
endif()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue