mirror of
https://github.com/MariaDB/server.git
synced 2026-05-17 20:37:12 +02:00
Merge branch '10.5' into 10.6
This commit is contained in:
commit
6efb5e9f5e
357 changed files with 8210 additions and 2131 deletions
|
|
@ -28,7 +28,7 @@ endif()
|
|||
set(GROONGA_NORMALIZER_MYSQL_EMBED ${GROONGA_NORMALIZER_MYSQL_EMBED_DEFAULT}
|
||||
CACHE BOOL "Build as a static library to embed into an application")
|
||||
|
||||
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version" VERSION)
|
||||
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/version_full" VERSION)
|
||||
|
||||
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
set(GROONGA_NORMALIZER_MYSQL_BUNDLED FALSE)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue