mirror of
https://github.com/MariaDB/server.git
synced 2026-04-22 08:15:31 +02:00
merging.
This commit is contained in:
commit
7c7269d372
568 changed files with 47077 additions and 11234 deletions
|
|
@ -86,15 +86,13 @@ FOREACH(rpath ${VIO_SOURCES})
|
|||
SET(LIB_SOURCES ${LIB_SOURCES} ../vio/${rpath})
|
||||
ENDFOREACH(rpath)
|
||||
|
||||
FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS})
|
||||
INCLUDE(${CMAKE_SOURCE_DIR}/storage/${plugin_dir_${ENGINE_LIB}}/CMakeLists.txt)
|
||||
STRING(TOUPPER ${ENGINE_LIB} ENGINE_LIB_UPPER)
|
||||
SET(ENGINE_DIR ${${ENGINE_LIB_UPPER}_DIR})
|
||||
INCLUDE(${CMAKE_SOURCE_DIR}/storage/${ENGINE_DIR}/CMakeLists.txt)
|
||||
FOREACH(rpath ${${ENGINE_LIB_UPPER}_SOURCES})
|
||||
SET(LIB_SOURCES ${LIB_SOURCES} ${CMAKE_SOURCE_DIR}/storage/${ENGINE_DIR}/${rpath})
|
||||
SET (ENGINE_BUILD_TYPE "STATIC")
|
||||
FOREACH (ENGINE ${MYSQLD_STATIC_ENGINES})
|
||||
INCLUDE(${${ENGINE}_DIR}/CMakeLists.txt)
|
||||
FOREACH(rpath ${${ENGINE}_SOURCES})
|
||||
SET(LIB_SOURCES ${LIB_SOURCES} ${${ENGINE}_DIR}/${rpath})
|
||||
ENDFOREACH(rpath)
|
||||
ENDFOREACH(ENGINE_LIB)
|
||||
ENDFOREACH(ENGINE)
|
||||
|
||||
SET(SOURCE_SUBLIBS FALSE)
|
||||
|
||||
|
|
@ -169,15 +167,14 @@ IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 8)
|
|||
ENDIF()
|
||||
|
||||
# Add any additional libraries requested by engine(s)
|
||||
FOREACH (ENGINE_LIB ${MYSQLD_STATIC_ENGINE_LIBS})
|
||||
STRING(TOUPPER ${ENGINE_LIB} ENGINE_LIB_UPPER)
|
||||
IF(${ENGINE_LIB_UPPER}_LIBS)
|
||||
TARGET_LINK_LIBRARIES(mysqlserver ${${ENGINE_LIB_UPPER}_LIBS})
|
||||
ENDIF(${ENGINE_LIB_UPPER}_LIBS)
|
||||
ENDFOREACH(ENGINE_LIB)
|
||||
FOREACH (ENGINE ${MYSQLD_STATIC_ENGINES})
|
||||
IF(${ENGINE}_LIBS)
|
||||
TARGET_LINK_LIBRARIES(mysqlserver ${${ENGINE}_LIBS})
|
||||
ENDIF(${ENGINE}_LIBS)
|
||||
ENDFOREACH(ENGINE)
|
||||
|
||||
ADD_LIBRARY(libmysqld SHARED cmake_dummy.c libmysqld.def)
|
||||
ADD_DEPENDENCIES(libmysqld mysqlserver)
|
||||
TARGET_LINK_LIBRARIES(libmysqld mysqlserver wsock32)
|
||||
TARGET_LINK_LIBRARIES(libmysqld mysqlserver wsock32 iphlpapi)
|
||||
|
||||
MYSQL_INSTALL_TARGETS(mysqlserver libmysqld DESTINATION lib COMPONENT Embedded)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue