Navigation Menu

Skip to content

Commit

Permalink
cmake: add missing LIBMRN_ sources for embedded storage engine
Browse files Browse the repository at this point in the history
refs #1544
  • Loading branch information
kenhys committed Nov 16, 2012
1 parent ff2c346 commit 20745ea
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions CMakeLists.txt
Expand Up @@ -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()

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 20745ea

Please sign in to comment.