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 | 135c25d1655217e42869096465e1c857ee3ed6ea (patch) | |
tree | b81e8a1a188f0bc6683d2889e5b2c374eeee05c7 /libmysqld | |
parent | 4fe79c7d58549b7490f51c7273440234a0f6b5be (diff) | |
download | mariadb-git-135c25d1655217e42869096465e1c857ee3ed6ea.tar.gz |
Fix smaller stuff: disable transitive linking for MERGE_LIBRARIES results,
compile embedded with PIC to allow linking with shared libraries
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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) |