Kouhei Sutou
null+****@clear*****
Fri Jan 30 15:14:52 JST 2015
Kouhei Sutou 2015-01-30 15:14:52 +0900 (Fri, 30 Jan 2015) New Revision: e675539dde12d6ca025670f2c63c9e478bf06bf1 https://github.com/mroonga/mroonga/commit/e675539dde12d6ca025670f2c63c9e478bf06bf1 Message: Simplify condition expression Modified files: CMakeLists.txt Modified: CMakeLists.txt (+6 -7) =================================================================== --- CMakeLists.txt 2015-01-30 15:10:07 +0900 (f9d0d44) +++ CMakeLists.txt 2015-01-30 15:14:52 +0900 (14ca21b) @@ -221,6 +221,11 @@ 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}") @@ -228,12 +233,6 @@ else() "groonga-normalizer-mysql >= ${REQUIRED_GROONGA_NORMALIZER_MYSQL_VERSION}") endif() -if(GROONGA_NORMALIZER_MYSQL_FOUND AND MRN_GROONGA_BUNDLED) - 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() - include_directories( "${PROJECT_BINARY_DIR}" "${PROJECT_SOURCE_DIR}" @@ -254,7 +253,7 @@ link_directories( ${MYSQL_LIBRARY_DIRS}) if(MRN_BUNDLED) - if(GROONGA_NORMALIZER_MYSQL_FOUND AND MRN_GROONGA_BUNDLED) + if(GROONGA_NORMALIZER_MYSQL_FOUND) mysql_add_plugin(mroonga "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" STORAGE_ENGINE MODULE_ONLY -------------- next part -------------- HTML����������������������������...ダウンロード
