diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-28 17:13:41 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-03-28 17:13:41 +0200 |
| commit | 45baac71a4ab8450da46db9d4ba4851d10f49016 (patch) | |
| tree | cd8add1694fae90d8afb98be57a1ab31ba93d957 | |
| parent | 262dd3204591b8128b4cb9b1f0e5185ea2e6c857 (diff) | |
| parent | 0f51f460347883b71d2502928b8d6a346e8f9f35 (diff) | |
| download | mariadb-git-45baac71a4ab8450da46db9d4ba4851d10f49016.tar.gz | |
merge
| -rwxr-xr-x | libmysql/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | libmysqld/CMakeLists.txt | 7 |
2 files changed, 3 insertions, 11 deletions
diff --git a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt index 2c9434b3a15..0d4f6f399af 100755 --- a/libmysql/CMakeLists.txt +++ b/libmysql/CMakeLists.txt @@ -124,8 +124,5 @@ ADD_DEPENDENCIES(libmysql GenError) TARGET_LINK_LIBRARIES(libmysql wsock32) ADD_DEFINITIONS(-DHAVE_DLOPEN) - -INSTALL(TARGETS mysqlclient DESTINATION lib COMPONENT Development) -INSTALL_DEBUG_SYMBOLS(mysqlclient DESTINATION lib) -INSTALL(TARGETS libmysql DESTINATION lib COMPONENT SharedLibraries) -INSTALL_DEBUG_SYMBOLS(libmysql DESTINATION lib) +MYSQL_INSTALL_TARGETS(mysqlclient DESTINATION lib COMPONENT Development) +MYSQL_INSTALL_TARGETS(libmysql DESTINATION lib COMPONENT SharedLibraries) diff --git a/libmysqld/CMakeLists.txt b/libmysqld/CMakeLists.txt index d074e7553ed..2898bf3a659 100644 --- a/libmysqld/CMakeLists.txt +++ b/libmysqld/CMakeLists.txt @@ -178,9 +178,4 @@ ADD_LIBRARY(libmysqld SHARED cmake_dummy.c libmysqld.def) ADD_DEPENDENCIES(libmysqld mysqlserver) TARGET_LINK_LIBRARIES(libmysqld mysqlserver wsock32) -INSTALL(TARGETS mysqlserver DESTINATION lib COMPONENT Embedded) -INSTALL_DEBUG_SYMBOLS(mysqlserver) -INSTALL_DEBUG_TARGET(mysqlserver DESTINATION lib/debug COMPONENT Embedded) - -INSTALL(TARGETS libmysqld DESTINATION lib COMPONENT Embedded) -INSTALL_DEBUG_SYMBOLS(libmysqld) +MYSQL_INSTALL_TARGETS(mysqlserver libmysqld DESTINATION lib COMPONENT Embedded) |