Commit cbfaa9b8 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,

compile embedded with PIC to allow linking with shared libraries
parent 9cb05dc8
...@@ -259,6 +259,7 @@ MACRO(MERGE_LIBRARIES) ...@@ -259,6 +259,7 @@ MACRO(MERGE_LIBRARIES)
IF(NOT ARG_NOINSTALL) IF(NOT ARG_NOINSTALL)
MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}") MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}")
ENDIF() ENDIF()
SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "")
ENDMACRO() ENDMACRO()
FUNCTION(GET_DEPENDEND_OS_LIBS target result) FUNCTION(GET_DEPENDEND_OS_LIBS target result)
......
...@@ -88,7 +88,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ...@@ -88,7 +88,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
) )
ADD_LIBRARY(sql_embedded STATIC ${SQL_EMBEDDED_SOURCES}) ADD_CONVENIENCE_LIBRARY(sql_embedded ${SQL_EMBEDDED_SOURCES})
DTRACE_INSTRUMENT(sql_embedded) DTRACE_INSTRUMENT(sql_embedded)
ADD_DEPENDENCIES(sql_embedded GenError GenServerSource) ADD_DEPENDENCIES(sql_embedded GenError GenServerSource)
......
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