diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-10-03 23:24:13 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-10-03 23:24:13 +0400 |
| commit | d1ad1bdc0fb4f1150c1363013e2ab4700c0bf570 (patch) | |
| tree | e6a92d7abb6736409db94511fc23e498e536b2a3 | |
| parent | 37c6613e15157fd6a07166b15389d4d0483a38a7 (diff) | |
| download | mariadb-git-d1ad1bdc0fb4f1150c1363013e2ab4700c0bf570.tar.gz | |
Fix embedded build on Windows: contents of storage/xtradb think they are
'innobase'.
| -rwxr-xr-x | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index edc0dff8310..cccd42205b1 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -233,6 +233,9 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS}) # where appropriate. STRING (REGEX MATCH "MYSQL_STORAGE_ENGINE.[a-z]*" PLUGIN_NAME ${PLUGIN_FILE_CONTENT}) STRING (REGEX REPLACE "MYSQL_STORAGE_ENGINE.(.*)" "\\1" PLUGIN_NAME ${PLUGIN_NAME}) + + # Also remember this "xtradb"/"innobase" name discrepancy for libmysqld/CMakeLists.txt: + SET (plugin_dir_${PLUGIN_NAME} ${DIRNAME}) IF(MYSQL_PLUGIN_MANDATORY) SET(WITH_${ENGINE}_STORAGE_ENGINE TRUE) @@ -245,6 +248,7 @@ FOREACH(SUBDIR ${STORAGE_SUBDIRS}) ELSE(WITH_${ENGINE}_STORAGE_ENGINE AND MYSQL_PLUGIN_STATIC) SET(ENGINE_BUILD_TYPE "NONE") ENDIF(WITH_${ENGINE}_STORAGE_ENGINE AND MYSQL_PLUGIN_STATIC) + IF (ENGINE_BUILD_TYPE STREQUAL "STATIC") SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_${PLUGIN_NAME}_plugin") SET (MYSQLD_STATIC_ENGINE_LIBS ${MYSQLD_STATIC_ENGINE_LIBS} ${PLUGIN_NAME}) diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 1ef8f21f752..f69f6d26c6d 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -88,10 +88,10 @@ FOREACH(rpath ${VIO_SOURCES}) ENDFOREACH(rpath) FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS}) - INCLUDE(${CMAKE_SOURCE_DIR}/storage/${ENGINE_LIB}/CMakeLists.txt) + INCLUDE(${CMAKE_SOURCE_DIR}/storage/${plugin_dir_${ENGINE_LIB}}/CMakeLists.txt) STRING(TOUPPER ${ENGINE_LIB} ENGINE_LIB_UPPER) FOREACH(rpath ${${ENGINE_LIB_UPPER}_SOURCES}) - SET(LIB_SOURCES ${LIB_SOURCES} ${CMAKE_SOURCE_DIR}/storage/${ENGINE_LIB}/${rpath}) + SET(LIB_SOURCES ${LIB_SOURCES} ${CMAKE_SOURCE_DIR}/storage/${plugin_dir_${ENGINE_LIB}}/${rpath}) ENDFOREACH(rpath) ENDFOREACH(ENGINE_LIB) |