HAYASHI Kentaro
null+****@clear*****
Fri Nov 16 17:55:57 JST 2012
HAYASHI Kentaro 2012-11-16 17:55:57 +0900 (Fri, 16 Nov 2012) New Revision: 20745ea2e7e5455e6689ce30178ec24a8c157705 https://github.com/mroonga/mroonga/commit/20745ea2e7e5455e6689ce30178ec24a8c157705 Log: cmake: add missing LIBMRN_ sources for embedded storage engine refs #1544 Modified files: CMakeLists.txt Modified: CMakeLists.txt (+10 -6) =================================================================== --- CMakeLists.txt 2012-11-16 17:27:49 +0900 (b6c7617) +++ CMakeLists.txt 2012-11-16 17:55:57 +0900 (6ce3006) @@ -40,16 +40,19 @@ include(${MRN_SOURCE_DIR}/build/cmake_modules/ReadFileList.cmake) 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 "([^;]+)" "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 "([^;]+)" "lib/\\1" - LIBMRN_NEED_MYSQL_SOURCES "${LIBMRN_NEED_MYSQL_SOURCES}") - if(WITH_MROONGA_STORAGE_ENGINE) + string(REGEX REPLACE "([^;]+)" "${MRN_SOURCE_DIR}/lib/\\1" + LIBMRN_NO_MYSQL_SOURCES "${LIBMRN_NO_MYSQL_SOURCES}") + string(REGEX REPLACE "([^;]+)" "${MRN_SOURCE_DIR}/lib/\\1" + LIBMRN_NEED_MYSQL_SOURCES "${LIBMRN_NEED_MYSQL_SOURCES}") set(MYSQL_SOURCE_DIR ${CMAKE_SOURCE_DIR} CACHE PATH "MySQL source directory") else() + string(REGEX REPLACE "([^;]+)" "lib/\\1" + LIBMRN_NO_MYSQL_SOURCES "${LIBMRN_NO_MYSQL_SOURCES}") + string(REGEX REPLACE "([^;]+)" "lib/\\1" + LIBMRN_NEED_MYSQL_SOURCES "${LIBMRN_NEED_MYSQL_SOURCES}") set(MYSQL_SOURCE_DIR "PATH" CACHE PATH "MySQL source directory") endif() @@ -140,7 +143,8 @@ if(WIN32) endif() if(WITH_MROONGA_STORAGE_ENGINE) - MYSQL_ADD_PLUGIN(mroonga "${MROONGA_SOURCES}" + MYSQL_ADD_PLUGIN(mroonga + "${MROONGA_SOURCES};${LIBMRN_NEED_MYSQL_SOURCES};${LIBMRN_NO_MYSQL_SOURCES}" STORAGE_ENGINE LINK_LIBRARIES ${GROONGA_LIBRARIES} RECOMPILE_FOR_EMBEDDED) -------------- next part -------------- HTML����������������������������...Download