database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,

Browse Source 
compile embedded with PIC to allow linking with shared libraries
This commit is contained in:
Vladislav Vaintroub
2010-01-25 02:52:32 +01:00
parent 03fcdd0194
commit 1519d8ccd1
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/libutils.cmake
View File

@ -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)

2
libmysqld/CMakeLists.txt
View File

@ -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)