susumu.yata
null+****@clear*****
Thu Jan 29 16:42:24 JST 2015
susumu.yata 2015-01-29 16:42:24 +0900 (Thu, 29 Jan 2015) New Revision: bea160116842b0a1810522f8812e66fc188ee47c https://github.com/mroonga/mroonga/commit/bea160116842b0a1810522f8812e66fc188ee47c Message: cmake: don't install additional modules if bundled with MariaDB Patch by Kentoku Shiba. Thanks!!! Modified files: CMakeLists.txt Modified: CMakeLists.txt (+30 -8) =================================================================== --- CMakeLists.txt 2015-01-28 18:09:05 +0900 (e480781) +++ CMakeLists.txt 2015-01-29 16:42:24 +0900 (faac165) @@ -221,6 +221,12 @@ 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}" @@ -241,10 +247,17 @@ link_directories( ${MYSQL_LIBRARY_DIRS}) if(MRN_BUNDLED) - mysql_add_plugin(mroonga - "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" - STORAGE_ENGINE MODULE_ONLY - LINK_LIBRARIES ${GROONGA_LIBRARIES}) + if(GROONGA_NORMALIZER_MYSQL_FOUND AND MRN_GROONGA_BUNDLED) + 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 + LINK_LIBRARIES ${GROONGA_LIBRARIES}) + else() + mysql_add_plugin(mroonga + "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" + STORAGE_ENGINE MODULE_ONLY + LINK_LIBRARIES ${GROONGA_LIBRARIES}) + endif() set(EXPANDED_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}") list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES @@ -327,9 +340,14 @@ if(GROONGA_NORMALIZER_MYSQL_FOUND) set(WITH_GROONGA_NORMALIZER_MYSQL 1) set_property(TARGET mroonga APPEND PROPERTY COMPILE_DEFINITIONS "WITH_GROONGA_NORMALIZER_MYSQL=1") - set(GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME \"normalizers/mysql\") - set_property(TARGET mroonga APPEND PROPERTY - COMPILE_DEFINITIONS "GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME=\"normalizers/mysql\"") + if(MRN_GROONGA_BUNDLED) + set_property(TARGET mroonga APPEND PROPERTY + COMPILE_DEFINITIONS "GROONGA_NORMALIZER_MYSQL_PLUGIN_IS_BUNDLED_STATIC=1") + else() + set(GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME \"normalizers/mysql\") + set_property(TARGET mroonga APPEND PROPERTY + COMPILE_DEFINITIONS "GROONGA_NORMALIZER_MYSQL_PLUGIN_NAME=\"normalizers/mysql\"") + endif() endif() set(MRN_DEFAULT_PARSER "TokenBigram" CACHE STRING "The default fulltext parser") @@ -361,7 +379,11 @@ configure_file( "${PROJECT_SOURCE_DIR}/data/install.sql.in" "${PROJECT_BINARY_DIR}/data/install.sql") -set(MRN_DATA_DIR "share/${PROJECT_NAME}") +if(MRN_BUNDLED) + set(MRN_DATA_DIR "${INSTALL_MYSQLSHAREDIR}/${PROJECT_NAME}") +else() + set(MRN_DATA_DIR "share/${PROJECT_NAME}") +endif() install(FILES "${PROJECT_BINARY_DIR}/data/install.sql" "${PROJECT_SOURCE_DIR}/data/uninstall.sql" -------------- next part -------------- HTML����������������������������...Download
