From 1519d8ccd17db7d342743132a70fed03e542dab7 Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <vvaintroub@mysql.com>
Date: Mon, 25 Jan 2010 02:52:32 +0100
Subject: [PATCH] Fix smaller stuff: disable transitive linking for
 MERGE_LIBRARIES results, compile embedded with PIC to allow linking with
 shared libraries

---
 cmake/libutils.cmake     | 1 +
 libmysqld/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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)