mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 13:02:28 +01:00
768bbae90e
Remove custom DLL loader code from innodb plugin code, use symbols exported from mysqld. storage/innodb_plugin/handler/ha_innodb.cc: Remove a Win32 workaround for current_thd. The original problem that innodb plugin used value of TLS variable across DLL boundaries is solved in MySQL server (current_thd is a function not TLS variable now) storage/innodb_plugin/handler/handler0alter.cc: Remove custom delay loader storage/innodb_plugin/handler/handler0vars.h: Remove custom delay loader storage/innodb_plugin/handler/i_s.cc: Remove custom delay loader storage/innodb_plugin/handler/win_delay_loader.cc: Remove custom delay loader storage/innodb_plugin/plug.in: Remove commented out MYSQL_PLUGIN_STATIC, CMake would not parse that correctly
36 lines
1.5 KiB
CMake
36 lines
1.5 KiB
CMake
# MYSQL_STORAGE_ENGINE Macro creates a project to build storage engine
|
|
# library.
|
|
#
|
|
# Parameters:
|
|
# engine - storage engine name.
|
|
# variable ENGINE_BUILD_TYPE should be set to "STATIC" or "DYNAMIC"
|
|
# Remarks:
|
|
# ${engine}_SOURCES variable containing source files to produce the library must set before
|
|
# calling this macro
|
|
|
|
MACRO(MYSQL_STORAGE_ENGINE engine)
|
|
IF(NOT SOURCE_SUBLIBS)
|
|
# Add common include directories
|
|
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib
|
|
${CMAKE_SOURCE_DIR}/sql
|
|
${CMAKE_SOURCE_DIR}/regex
|
|
${CMAKE_SOURCE_DIR}/extra/yassl/include)
|
|
STRING(TOUPPER ${engine} engine)
|
|
STRING(TOLOWER ${engine} libname)
|
|
IF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC")
|
|
ADD_DEFINITIONS(-DWITH_${engine}_STORAGE_ENGINE -DMYSQL_SERVER)
|
|
#Create static library. The name of the library is <storage_engine>.lib
|
|
ADD_LIBRARY(${libname} ${${engine}_SOURCES})
|
|
ADD_DEPENDENCIES(${libname} GenError)
|
|
MESSAGE("build ${engine} as static library")
|
|
ELSEIF(${ENGINE_BUILD_TYPE} STREQUAL "DYNAMIC")
|
|
ADD_DEFINITIONS(-DMYSQL_DYNAMIC_PLUGIN)
|
|
#Create a DLL.The name of the dll is ha_<storage_engine>.dll
|
|
#The dll is linked to the mysqld executable
|
|
SET(dyn_libname ha_${libname})
|
|
ADD_LIBRARY(${dyn_libname} SHARED ${${engine}_SOURCES})
|
|
TARGET_LINK_LIBRARIES (${dyn_libname} mysqld)
|
|
MESSAGE("build ${engine} as DLL")
|
|
ENDIF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC")
|
|
ENDIF(NOT SOURCE_SUBLIBS)
|
|
ENDMACRO(MYSQL_STORAGE_ENGINE)
|