diff options
author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 12:43:02 +0300 |
---|---|---|
committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-09-19 12:43:02 +0300 |
commit | 22c322c649d5a15e3bb731d6751a0d80c8ec23b0 (patch) | |
tree | 11073f6169c237da226a977736d234c7c7b5c163 /libmysqld | |
parent | 7d49aab32c3733f26cff8d83396a65bd120352e8 (diff) | |
parent | ec6042bda097fa53c43caf4a1acc32c5a77f6ed4 (diff) | |
download | mariadb-git-22c322c649d5a15e3bb731d6751a0d80c8ec23b0.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'libmysqld')
-rw-r--r-- | libmysqld/CMakeLists.txt | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 0022bb1442d..f329d0db602 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -160,15 +160,6 @@ MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} INSTALL(FILES embedded_priv.h DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT ${COMPONENT_MYSQLSERVER}) -# 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() SET(CLIENT_API_FUNCTIONS_5_1 get_tty_password |