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
commit2f3e777797a643284ffdd0f31c820497097ab451 (patch)
tree26bb5c1d3ec68a6840888eb5cf866fe2396e6a70 /libmysqld
parentb224e24a1e560c991c5d6391607a904a636cb4ed (diff)
downloadmariadb-git-2f3e777797a643284ffdd0f31c820497097ab451.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()