summaryrefslogtreecommitdiff
path: root/libmysqld
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2010-02-10 20:23:24 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2010-02-10 20:23:24 +0100
commit3bd236fefb0024fa4f304d50f8725fcd153631f1 (patch)
treedfea6a5cf6f617ecfe6559b0eff36aba6b474d05 /libmysqld
parent784d4a47187a960b43225d45a27ee0fe435603ea (diff)
downloadmariadb-git-3bd236fefb0024fa4f304d50f8725fcd153631f1.tar.gz
Add components to INSTALL, some eraly Wix support
Diffstat (limited to 'libmysqld')
-rw-r--r--libmysqld/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt
index 5c83db5f87c..b02510bda46 100644
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -123,8 +123,9 @@ FOREACH(LIB ${LIBS})
ENDFOREACH()
MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS}
- OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME})
+ OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded)
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()