diff options
| author | Alexander Nozdrin <alik@ibmvm> | 2010-06-21 17:08:16 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@ibmvm> | 2010-06-21 17:08:16 +0400 |
| commit | bba0a92d03dc9e17258e26c260e77d496948deea (patch) | |
| tree | 30763ecb9f7a6e13fb5124138efb039fe120cc56 /libmysqld | |
| parent | 36348425da94591ab4ab6257cc641ba03aa58e4e (diff) | |
| parent | 915bfb505e4bd24081945259f887e652ae2709ce (diff) | |
| download | mariadb-git-bba0a92d03dc9e17258e26c260e77d496948deea.tar.gz | |
Auto-merge from mysql-trunk-stage.
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 1cdf8e41a74..6f553ef9c11 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -125,7 +125,7 @@ FOREACH(LIB ${LIBS}) ENDFOREACH() MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} - OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME}) + OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded) # Visual Studio users need debug static library IF(MSVC) @@ -138,5 +138,6 @@ IF(UNIX) ENDIF() IF(MSVC AND NOT DISABLE_SHARED) - MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS}) + MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} + COMPONENT Embedded) ENDIF() |