Navigation Menu

Skip to content

Commit

Permalink
Require groonga 2.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed May 19, 2012
1 parent 66600a6 commit a8b0450
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Expand Up @@ -24,6 +24,8 @@ file(READ ${CMAKE_SOURCE_DIR}/version_micro MRN_VERSION_MICRO)
file(READ ${CMAKE_SOURCE_DIR}/version_in_hex MRN_VERSION_IN_HEX)
file(READ ${CMAKE_SOURCE_DIR}/plugin_version MRN_PLUGIN_VERSION)

file(READ ${CMAKE_SOURCE_DIR}/required_groonga_version REQUIRED_GROONGA_VERSION)

set(MRN_PACKAGE_STRING "${PROJECT_NAME} ${MRN_VERSION}")

include(${CMAKE_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake)
Expand Down Expand Up @@ -62,7 +64,7 @@ set_mysql_config_value("--cflags" MYSQL_CFLAGS)
set_mysql_config_value("--version" MYSQL_VERSION)

include(FindPkgConfig)
pkg_check_modules(GROONGA REQUIRED "groonga >= 2.0.0")
pkg_check_modules(GROONGA REQUIRED "groonga >= ${REQUIRED_GROONGA_VERSION}")

include_directories(
"${PROJECT_BINARY_DIR}"
Expand Down
3 changes: 2 additions & 1 deletion configure.ac
Expand Up @@ -165,8 +165,9 @@ AC_DEFUN([CONFIG_OPTION_MYSQL],[
AC_MSG_RESULT($mrn_mysql_innodb_fts_p)
])

m4_define([mrn_required_groonga_version], m4_include(required_groonga_version))
AC_DEFUN([CONFIG_OPTION_GROONGA],[
PKG_CHECK_MODULES(GROONGA, groonga >= 2.0.2)
PKG_CHECK_MODULES(GROONGA, groonga >= 2.0.3)
_PKG_CONFIG(GROONGA_VERSION, variable=groonga_version, groonga)
GROONGA_VERSION=$pkg_cv_GROONGA_VERSION
AC_SUBST(GROONGA_VERSION)
Expand Down
1 change: 1 addition & 0 deletions required_groonga_version
@@ -0,0 +1 @@
2.0.3

0 comments on commit a8b0450

Please sign in to comment.