diff options
| author | Daniel Fischer <df@sun.com> | 2010-04-21 14:58:09 +0200 |
|---|---|---|
| committer | Daniel Fischer <df@sun.com> | 2010-04-21 14:58:09 +0200 |
| commit | 50edf454b14a5094603688b4eaf1c50ed280ba90 (patch) | |
| tree | 4fad82e285f056995b626f0a62b5fa0488294c19 /libmysqld/CMakeLists.txt | |
| parent | 7fcf60b80e66b6a7c037d89e3b266b7a9d68bc48 (diff) | |
| parent | c6c992e1cb817401f5a09fd7f6cf4eaebf448fab (diff) | |
| download | mariadb-git-50edf454b14a5094603688b4eaf1c50ed280ba90.tar.gz | |
Merge
Diffstat (limited to 'libmysqld/CMakeLists.txt')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index b02510bda46..6c58429e065 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -81,9 +81,10 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc ../sql/scheduler.cc ../sql/sql_audit.cc ../sql/event_parse_data.cc ../sql/sql_signal.cc ../sql/rpl_handler.cc - ../sql/rpl_utility.cc + ../sql/rpl_utility.cc ../sql/sys_vars.cc ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc + ../sql/mdl.cc ../sql/transaction.cc ${GEN_SOURCES} ${MYSYS_LIBWRAP_SOURCE} ) @@ -125,6 +126,16 @@ ENDFOREACH() MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded) +# Visual Studio users need debug static library +IF(MSVC) + INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR}/debug) +ENDIF() + +IF(UNIX) + INSTALL_DEBUG_TARGET(mysqlserver DESTINATION ${INSTALL_LIBDIR} RENAME + ${CMAKE_STATIC_LIBRARY_PREFIX}mysqld-debug) +ENDIF() + IF(MSVC AND NOT DISABLE_SHARED) MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT Embedded) |