diff options
| author | Daniel Fischer <df@sun.com> | 2010-06-18 17:04:15 +0200 |
|---|---|---|
| committer | Daniel Fischer <df@sun.com> | 2010-06-18 17:04:15 +0200 |
| commit | 9891642e773dd2fb1b8032e603b23a4c0f804eb0 (patch) | |
| tree | 129482b631bc451c9ff9b99ac55692b6bec2563d /libmysqld | |
| parent | 527446e0a256e6a111724b6f8346640e3cc5e947 (diff) | |
| parent | 89205a3bf6bba245e312078b23168ff5f8560759 (diff) | |
| download | mariadb-git-9891642e773dd2fb1b8032e603b23a4c0f804eb0.tar.gz | |
merge
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 fa5088f288b..f6ecc340db6 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -124,7 +124,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) @@ -137,5 +137,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() |