Merge branch '10.2' into 10.3

This commit is contained in:
Oleksandr Byelkin 2021-07-29 13:51:02 +02:00
commit 83d7e4faf6
140 changed files with 2665 additions and 1348 deletions

View file

@ -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)