diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-22 11:04:32 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-22 11:04:32 +0200 |
| commit | ec586f529c871ec39556ded59206bdb813387130 (patch) | |
| tree | f6121386b8b032c912bfdc30af858b3f04678f75 /libmysqld | |
| parent | 329daad2d32730c1aade8134d1709383fe072309 (diff) | |
| download | mariadb-git-ec586f529c871ec39556ded59206bdb813387130.tar.gz | |
Building RPMs with CPack
configure with cmake -DRPM=distro
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libmysqld/examples/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index f08159da20a..c40beb5f9a1 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -134,7 +134,7 @@ FOREACH(LIB ${LIBS}) ENDFOREACH() MERGE_LIBRARIES(mysqlserver STATIC ${EMBEDDED_LIBS} - OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Embedded) + OUTPUT_NAME ${MYSQLSERVER_OUTPUT_NAME} COMPONENT Development) # Visual Studio users need debug static library IF(MSVC) @@ -148,7 +148,7 @@ ENDIF() IF(NOT DISABLE_SHARED) MERGE_LIBRARIES(libmysqld SHARED mysqlserver EXPORTS ${CLIENT_API_FUNCTIONS} - COMPONENT Embedded) + COMPONENT Server) IF(UNIX) # Name the shared library, handle versioning (provides same api as client # library hence the same version) diff --git a/libmysqld/examples/CMakeLists.txt b/libmysqld/examples/CMakeLists.txt index e607f3c685a..146e51d79c7 100644 --- a/libmysqld/examples/CMakeLists.txt +++ b/libmysqld/examples/CMakeLists.txt @@ -26,7 +26,7 @@ ADD_DEFINITIONS(-DEMBEDDED_LIBRARY -UMYSQL_CLIENT) MYSQL_ADD_EXECUTABLE(mysql_embedded ../../client/completion_hash.cc ../../client/mysql.cc ../../client/readline.cc - COMPONENT Test) + COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_embedded mysqlserver) IF(UNIX) TARGET_LINK_LIBRARIES(mysql_embedded ${MY_READLINE_LIBRARY}) |