diff options
| author | Bo Thorsen <bo@askmonty.org> | 2010-06-28 16:41:43 +0200 |
|---|---|---|
| committer | Bo Thorsen <bo@askmonty.org> | 2010-06-28 16:41:43 +0200 |
| commit | 3a2e38aa2829eee3b4b66bd51e43c4be1c11b36b (patch) | |
| tree | e4df3729a5bcad418b437f3d69cae82dd3d94708 | |
| parent | 6a6d87186a5bf74bc4efd3a5bdb2592107164cd7 (diff) | |
| download | mariadb-git-3a2e38aa2829eee3b4b66bd51e43c4be1c11b36b.tar.gz | |
Install the files for the embedded server
| -rwxr-xr-x | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 425039ea062..7a938e73c09 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -355,13 +355,16 @@ SET(CPACK_COMPONENT_HEADERS_DESCRIPTION "Header files for development on MariaDB SET(CPACK_COMPONENT_HEADERS_DEPENDS runtime) SET(CPACK_COMPONENT_HEADERS_GROUP "Development") SET(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Development) +SET(CPACK_COMPONENT_EMBEDDED_DISPLAY_NAME "Embedded") +SET(CPACK_COMPONENT_EMBEDDED_DESCRIPTION "Files for embedding MariaDB in other projects.") +SET(CPACK_COMPONENT_EMBEDDED_DEPENDS headers) +SET(CPACK_COMPONENT_EMBEDDED_GROUP "Development") +SET(CPACK_COMPONENT_EMBEDDED_INSTALL_TYPES Development) SET(CPACK_COMPONENT_SCRIPTS_DISPLAY_NAME "Server scripts") SET(CPACK_COMPONENT_SCRIPTS_DESCRIPTION "SQL and Perl scripts to control and modify the server. You need a perl installation for some of these to work.") SET(CPACK_COMPONENT_SCRIPTS_DEPENDS runtime) SET(CPACK_COMPONENT_SCRIPTS_GROUP "Server") SET(CPACK_COMPONENT_SCRIPTS_INSTALL_TYPES Normal Development) -# TODO: Add debug files -# TODO: Add embedded server files # TODO: Add test files # TODO: Add sql-bench diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index 9adf91c997b..495a8375af8 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -166,3 +166,8 @@ ENDFOREACH(ENGINE_LIB) ADD_LIBRARY(libmysqld SHARED cmake_dummy.c libmysqld.def) ADD_DEPENDENCIES(libmysqld mysqlserver) TARGET_LINK_LIBRARIES(libmysqld mysqlserver wsock32) + +INSTALL(TARGETS mysqlserver DESTINATION Embedded/static COMPONENT embedded) + +INSTALL(TARGETS libmysqld DESTINATION Embedded/DLL COMPONENT embedded) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/Release/libmysqld.exp DESTINATION Embedded/DLL COMPONENT embedded) |