Kouhei Sutou
null+****@clear*****
Fri Jan 30 15:36:56 JST 2015
Kouhei Sutou 2015-01-30 15:36:56 +0900 (Fri, 30 Jan 2015) New Revision: 4afa2cdb34960ffc8cbd2a5e3f3b6a232656e34f https://github.com/mroonga/mroonga/commit/4afa2cdb34960ffc8cbd2a5e3f3b6a232656e34f Message: cmake: unify condition body Modified files: CMakeLists.txt Modified: CMakeLists.txt (+3 -5) =================================================================== --- CMakeLists.txt 2015-01-30 15:32:19 +0900 (f814444) +++ CMakeLists.txt 2015-01-30 15:36:56 +0900 (bea87e8) @@ -221,11 +221,6 @@ if(MRN_GROONGA_BUNDLED) else() set(GROONGA_NORMALIZER_MYSQL_FOUND FALSE) endif() - if(GROONGA_NORMALIZER_MYSQL_FOUND) - read_file_list(${MRN_BUNDLED_GROONGA_DIR}/vendor/plugins/groonga-normalizer-mysql/normalizers/mysql_sources.am MRN_GRN_NORMALIZER_MYSQL_SOURCES) - string(REGEX REPLACE "([^;]+)" "${MRN_BUNDLED_GROONGA_DIR}/vendor/plugins/groonga-normalizer-mysql/normalizers/\\1" - MRN_GRN_NORMALIZER_MYSQL_SOURCES "${MRN_GRN_NORMALIZER_MYSQL_SOURCES}") - endif() else() include(FindPkgConfig) pkg_check_modules(GROONGA REQUIRED "groonga >= ${REQUIRED_GROONGA_VERSION}") @@ -254,6 +249,9 @@ link_directories( if(MRN_BUNDLED) if(GROONGA_NORMALIZER_MYSQL_FOUND) + read_file_list(${MRN_BUNDLED_GROONGA_DIR}/vendor/plugins/groonga-normalizer-mysql/normalizers/mysql_sources.am MRN_GRN_NORMALIZER_MYSQL_SOURCES) + string(REGEX REPLACE "([^;]+)" "${MRN_BUNDLED_GROONGA_DIR}/vendor/plugins/groonga-normalizer-mysql/normalizers/\\1" + MRN_GRN_NORMALIZER_MYSQL_SOURCES "${MRN_GRN_NORMALIZER_MYSQL_SOURCES}") mysql_add_plugin(mroonga "${MRN_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" STORAGE_ENGINE MODULE_ONLY -------------- next part -------------- HTML����������������������������...ダウンロード
