Commit 1417606b authored by Sergei Golubchik's avatar Sergei Golubchik

on windows: don't link all plugins with mysqld, only do it for storage engines.

parent 4b791936
...@@ -42,7 +42,7 @@ IF(NOT SOURCE_SUBLIBS) ...@@ -42,7 +42,7 @@ IF(NOT SOURCE_SUBLIBS)
ADD_DEFINITIONS(-DMYSQL_DYNAMIC_PLUGIN) ADD_DEFINITIONS(-DMYSQL_DYNAMIC_PLUGIN)
ADD_VERSION_INFO(${${engine}_LIB} SHARED ${engine}_SOURCES) ADD_VERSION_INFO(${${engine}_LIB} SHARED ${engine}_SOURCES)
ADD_LIBRARY(${${engine}_LIB} MODULE ${${engine}_SOURCES}) ADD_LIBRARY(${${engine}_LIB} MODULE ${${engine}_SOURCES})
TARGET_LINK_LIBRARIES (${${engine}_LIB} mysqlservices mysqld) TARGET_LINK_LIBRARIES (${${engine}_LIB} mysqlservices)
IF(${engine}_LIBS) IF(${engine}_LIBS)
TARGET_LINK_LIBRARIES(${${engine}_LIB} ${${engine}_LIBS}) TARGET_LINK_LIBRARIES(${${engine}_LIB} ${${engine}_LIBS})
ENDIF(${engine}_LIBS) ENDIF(${engine}_LIBS)
...@@ -61,6 +61,8 @@ IF(NOT SOURCE_SUBLIBS) ...@@ -61,6 +61,8 @@ IF(NOT SOURCE_SUBLIBS)
${CMAKE_SOURCE_DIR}/extra/yassl/include) ${CMAKE_SOURCE_DIR}/extra/yassl/include)
IF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC") IF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC")
ADD_DEFINITIONS(-DWITH_${engine}_STORAGE_ENGINE -DMYSQL_SERVER) ADD_DEFINITIONS(-DWITH_${engine}_STORAGE_ENGINE -DMYSQL_SERVER)
ELSEIF(${ENGINE_BUILD_TYPE} STREQUAL "DYNAMIC")
TARGET_LINK_LIBRARIES (${${engine}_LIB} mysqld)
ENDIF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC") ENDIF(${ENGINE_BUILD_TYPE} STREQUAL "STATIC")
ENDIF(NOT SOURCE_SUBLIBS) ENDIF(NOT SOURCE_SUBLIBS)
ENDMACRO(MYSQL_STORAGE_ENGINE) ENDMACRO(MYSQL_STORAGE_ENGINE)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment