Kouhei Sutou
null+****@clear*****
Sat Jun 20 12:56:39 JST 2015
Kouhei Sutou 2015-06-20 12:56:39 +0900 (Sat, 20 Jun 2015) New Revision: e4f3245062dfc84b93b7407a457c763195897df7 https://github.com/mroonga/mroonga/commit/e4f3245062dfc84b93b7407a457c763195897df7 Message: Use "embedded" form Modified files: CMakeLists.txt lib/mrn_database_manager.cpp Modified: CMakeLists.txt (+6 -1) =================================================================== --- CMakeLists.txt 2015-06-20 12:42:59 +0900 (8635d2e) +++ CMakeLists.txt 2015-06-20 12:56:39 +0900 (417eee9) @@ -390,13 +390,18 @@ if(GROONGA_NORMALIZER_MYSQL_FOUND) COMPILE_DEFINITIONS "WITH_GROONGA_NORMALIZER_MYSQL=1") if(MRN_GROONGA_NORMALIZER_MYSQL_EMBED) set_property(TARGET mroonga APPEND PROPERTY - COMPILE_DEFINITIONS "MRN_GROONGA_NORMALIZER_MYSQL_EMBED") + COMPILE_DEFINITIONS "MRN_GROONGA_NORMALIZER_MYSQL_EMBEDDED") else() set_property(TARGET mroonga APPEND PROPERTY COMPILE_DEFINITIONS "GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME=\"normalizers/mysql\"") endif() endif() +if(MRN_GROONGA_EMBED) + set_property(TARGET mroonga APPEND PROPERTY + COMPILE_DEFINITIONS "MRN_GROONGA_EMBEDDED") +endif() + set(MRN_DEFAULT_PARSER "" CACHE STRING "The default fulltext parser (Deprecated. Use MRN_DEFAULT_TOKENIZER instead.)") set(MRN_DEFAULT_TOKENIZER "" CACHE STRING Modified: lib/mrn_database_manager.cpp (+1 -1) =================================================================== --- lib/mrn_database_manager.cpp 2015-06-20 12:42:59 +0900 (cfd17b2) +++ lib/mrn_database_manager.cpp 2015-06-20 12:56:39 +0900 (753d155) @@ -312,7 +312,7 @@ namespace mrn { int error = 0; #ifdef WITH_GROONGA_NORMALIZER_MYSQL { -# ifdef MRN_GROONGA_NORMALIZER_MYSQL_EMBED +# ifdef MRN_GROONGA_NORMALIZER_MYSQL_EMBEDDED GRN_PLUGIN_IMPL_NAME_TAGGED(init, normalizers_mysql)(ctx_); GRN_PLUGIN_IMPL_NAME_TAGGED(register, normalizers_mysql)(ctx_); # else -------------- next part -------------- HTML����������������������������...Download