Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,

compile embedded with PIC to allow linking with shared libraries

Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,
compile embedded with PIC to allow linking with shared libraries
cbfaa9b8 · Vladislav Vaintroub · 9cb05dc8 · cbfaa9b8 · cbfaa9b8
Commit cbfaa9b8 authored Jan 25, 2010 by Vladislav Vaintroub
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

cmake/libutils.cmake cmake/libutils.cmake +1 -0

libmysqld/CMakeLists.txt libmysqld/CMakeLists.txt +1 -1

No files found.
--- 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)

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