[Groonga-mysql-commit] mroonga/mroonga [master] cmake: don't require -DMYSQL_CONFIG

Back to archive index

null+****@clear***** null+****@clear*****
2012年 5月 20日 (日) 16:25:15 JST


Kouhei Sutou	2012-05-20 16:25:15 +0900 (Sun, 20 May 2012)

  New Revision: a725c7f1f9f3f310a6717106536bd956b5272cbc

  Log:
    cmake: don't require -DMYSQL_CONFIG

  Modified files:
    CMakeLists.txt

  Modified: CMakeLists.txt (+5 -3)
===================================================================
--- CMakeLists.txt    2012-05-20 16:24:31 +0900 (1eb72ae)
+++ CMakeLists.txt    2012-05-20 16:25:15 +0900 (70930b6)
@@ -61,9 +61,11 @@ macro(SET_MYSQL_CONFIG_VALUE OPTION VARIABLE)
   string(STRIP ${MYSQL_CONFIG_OUTPUT} ${VARIABLE})
 endmacro()
 
-set_mysql_config_value("--plugindir" MYSQL_PLUGIN_DIR)
-set_mysql_config_value("--cflags" MYSQL_CFLAGS)
-set_mysql_config_value("--version" MYSQL_VERSION)
+if(MYSQL_CONFIG)
+  set_mysql_config_value("--plugindir" MYSQL_PLUGIN_DIR)
+  set_mysql_config_value("--cflags" MYSQL_CFLAGS)
+  set_mysql_config_value("--version" MYSQL_VERSION)
+endif()
 
 include(FindPkgConfig)
 pkg_check_modules(GROONGA REQUIRED "groonga >= ${REQUIRED_GROONGA_VERSION}")




Groonga-mysql-commit メーリングリストの案内
Back to archive index