maria-developers team mailing list archive

[Sergey Petrunya <psergey@xxxxxxxxxxxx>]

At file:///home/psergey/bzr-new/mysql-5.1-maria-contd4/

------------------------------------------------------------
revno: 2750
revision-id: psergey@xxxxxxxxxxxx-20091003192413-50pog1zkms4xe670
parent: psergey@xxxxxxxxxxxx-20091003190231-qqv8elhf8fs4ugxu
committer: Sergey Petrunya <psergey@xxxxxxxxxxxx>
branch nick: mysql-5.1-maria-contd4
timestamp: Sat 2009-10-03 23:24:13 +0400
message:
  Fix embedded build on Windows: contents of storage/xtradb think they are
    'innobase'.
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt	2009-09-15 21:20:58 +0000
+++ b/CMakeLists.txt	2009-10-03 19:24:13 +0000
@@ -233,6 +233,9 @@
 	# 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 @@
         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})

=== modified file 'libmysqld/CMakeLists.txt'
--- a/libmysqld/CMakeLists.txt	2009-10-01 10:46:59 +0000
+++ b/libmysqld/CMakeLists.txt	2009-10-03 19:24:13 +0000
@@ -88,10 +88,10 @@
 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)