Kouhei Sutou
null+****@clear*****
Fri Jan 30 16:48:29 JST 2015
Kouhei Sutou 2015-01-30 16:48:29 +0900 (Fri, 30 Jan 2015) New Revision: c90bd07bf7ffe0074ca58b902c9ea0c20458590f https://github.com/mroonga/mroonga/commit/c90bd07bf7ffe0074ca58b902c9ea0c20458590f Message: cmake: share common code Modified files: CMakeLists.txt Modified: CMakeLists.txt (+13 -14) =================================================================== --- CMakeLists.txt 2015-01-30 15:36:56 +0900 (bea87e8) +++ CMakeLists.txt 2015-01-30 16:48:29 +0900 (8784d79) @@ -247,21 +247,24 @@ link_directories( ${GROONGA_LIBRARY_DIRS} ${MYSQL_LIBRARY_DIRS}) +set(MRN_ALL_SOURCES + ${MRN_SOURCES} + ${MRN_UDF_SOURCES} + ${LIBMRN_NO_MYSQL_SOURCES} + ${LIBMRN_NEED_MYSQL_SOURCES}) + 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 - LINK_LIBRARIES ${GROONGA_LIBRARIES}) - else() - mysql_add_plugin(mroonga - "${MRN_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" - STORAGE_ENGINE MODULE_ONLY - LINK_LIBRARIES ${GROONGA_LIBRARIES}) + set(MRN_ALL_SOURCES + "${MRN_ALL_SOURCES};${MRN_GRN_NORMALIZER_MYSQL_SOURCES}") endif() + mysql_add_plugin(mroonga + ${MRN_ALL_SOURCES} + STORAGE_ENGINE MODULE_ONLY + LINK_LIBRARIES ${GROONGA_LIBRARIES}) set(EXPANDED_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_LIBDIR}") list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES @@ -272,11 +275,7 @@ if(MRN_BUNDLED) INSTALL_RPATH "${EXPANDED_INSTALL_LIBDIR}") endif() else() - add_library(mroonga MODULE - ${MRN_SOURCES} - ${MRN_UDF_SOURCES} - ${LIBMRN_NO_MYSQL_SOURCES} - ${LIBMRN_NEED_MYSQL_SOURCES}) + add_library(mroonga MODULE ${MRN_ALL_SOURCES}) set(MYSQL_LIBRARIES "mysqlservices") target_link_libraries(mroonga ${GROONGA_LIBRARIES} ${MYSQL_LIBRARIES}) -------------- next part -------------- HTML����������������������������...ダウンロード
