Kouhei Sutou
null+****@clear*****
Fri Aug 9 17:05:22 JST 2013
Kouhei Sutou 2013-08-09 17:05:22 +0900 (Fri, 09 Aug 2013) New Revision: a7bb74171cbbccf25a80c9ffc404ff44753ebe19 https://github.com/mroonga/mroonga/commit/a7bb74171cbbccf25a80c9ffc404ff44753ebe19 Message: cmake: support UDF build Modified files: CMakeLists.txt Modified: CMakeLists.txt (+9 -5) =================================================================== --- CMakeLists.txt 2013-08-09 16:59:40 +0900 (352a3f6) +++ CMakeLists.txt 2013-08-09 17:05:22 +0900 (f4f61c2) @@ -69,20 +69,23 @@ set(MRN_PACKAGE_STRING "${PROJECT_NAME} ${MRN_VERSION}") include(${MRN_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake) if(MRN_BUNDLED) - set(LIBMRN_DIR_PREFIX "${MRN_SOURCE_DIR}/") + set(MRN_RELATIVE_DIR_PREFIX "${MRN_SOURCE_DIR}/") else() - set(LIBMRN_DIR_PREFIX "") + set(MRN_RELATIVE_DIR_PREFIX "") endif() read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/sources.am MROONGA_SOURCES) read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/lib/libmrn_no_mysql_sources.am LIBMRN_NO_MYSQL_SOURCES) -string(REGEX REPLACE "([^;]+)" "${LIBMRN_DIR_PREFIX}lib/\\1" +string(REGEX REPLACE "([^;]+)" "${MRN_RELATIVE_DIR_PREFIX}lib/\\1" LIBMRN_NO_MYSQL_SOURCES "${LIBMRN_NO_MYSQL_SOURCES}") read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/lib/libmrn_need_mysql_sources.am LIBMRN_NEED_MYSQL_SOURCES) -string(REGEX REPLACE "([^;]+)" "${LIBMRN_DIR_PREFIX}lib/\\1" +string(REGEX REPLACE "([^;]+)" "${MRN_RELATIVE_DIR_PREFIX}lib/\\1" LIBMRN_NEED_MYSQL_SOURCES "${LIBMRN_NEED_MYSQL_SOURCES}") +read_file_list(${CMAKE_CURRENT_SOURCE_DIR}/udf/sources.am MRN_UDF_SOURCES) +string(REGEX REPLACE "([^;]+)" "${MRN_RELATIVE_DIR_PREFIX}udf/\\1" + MRN_UDF_SOURCES "${MRN_UDF_SOURCES}") if(MRN_BUNDLED) set(MYSQL_SOURCE_DIR ${CMAKE_SOURCE_DIR}) @@ -171,7 +174,7 @@ link_directories( if(MRN_BUNDLED) mysql_add_plugin(ha_mroonga - "${MROONGA_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" + "${MROONGA_SOURCES};${MRN_UDF_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES ${GROONGA_LIBRARIES} MODULE_OUTPUT_NAME "ha_mroonga") @@ -187,6 +190,7 @@ if(MRN_BUNDLED) else() add_library(ha_mroonga MODULE ${MROONGA_SOURCES} + ${MRN_UDF_SOURCES} ${LIBMRN_NO_MYSQL_SOURCES} ${LIBMRN_NEED_MYSQL_SOURCES}) -------------- next part -------------- HTML����������������������������...ダウンロード
