summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@koala>2009-11-25 05:13:51 +0100
committerVladislav Vaintroub <vvaintroub@koala>2009-11-25 05:13:51 +0100
commit39a158221ddac1c83766fe0b4635d854a664f262 (patch)
tree26bb5c1d3ec68a6840888eb5cf866fe2396e6a70 /libmysqld
parent23cd3cec41afcd443a666b614ceb79d726664ead (diff)
downloadmariadb-git-39a158221ddac1c83766fe0b4635d854a664f262.tar.gz
add --disable-shared equivalent
fix mtr (empty argument passed to mysqld)
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/CMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index d02cf2e6149..7378d23790d 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -120,8 +120,10 @@ ENDFOREACH()
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME})
INSTALL(TARGETS mysqlserver DESTINATION lib)
+INSTALL_DEBUG_SYMBOLS(mysqlserver)
-IF(MSVC)
+IF(MSVC AND NOT DISABLE_SHARED)
MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS})
INSTALL(TARGETS libmysqld DESTINATION lib)
+ INSTALL_DEBUG_SYMBOLS(libmysqld)
ENDIF()