diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-25 02:52:32 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-01-25 02:52:32 +0100 |
| commit | 1519d8ccd17db7d342743132a70fed03e542dab7 (patch) | |
| tree | b81e8a1a188f0bc6683d2889e5b2c374eeee05c7 | |
| parent | 03fcdd0194a0d3026c394b52e127d85577ff5eca (diff) | |
| download | mariadb-git-1519d8ccd17db7d342743132a70fed03e542dab7.tar.gz | |
Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,
compile embedded with PIC to allow linking with shared libraries
| -rw-r--r-- | cmake/libutils.cmake | 1 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 677504f89af..f20e21b8f86 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -259,6 +259,7 @@ MACRO(MERGE_LIBRARIES) IF(NOT ARG_NOINSTALL) MYSQL_INSTALL_TARGETS(${TARGET} DESTINATION "${INSTALL_LIBDIR}") ENDIF() + SET_TARGET_PROPERTIES(${TARGET} PROPERTIES LINK_INTERFACE_LIBRARIES "") ENDMACRO() FUNCTION(GET_DEPENDEND_OS_LIBS target result) diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 0f62bf6eb64..acc7d3fecd2 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -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) ADD_DEPENDENCIES(sql_embedded GenError GenServerSource) |