merge

aa8cc813 · Vladislav Vaintroub · 90b5afaa · 0f51f460 · aa8cc813 · aa8cc813
Commit aa8cc813 authored Mar 28, 2011 by Vladislav Vaintroub
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 11 deletions

libmysql/CMakeLists.txt libmysql/CMakeLists.txt +2 -5

libmysqld/CMakeLists.txt libmysqld/CMakeLists.txt +1 -6

No files found.
--- 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)
+MYSQL_INSTALL_TARGETS(mysqlclient DESTINATION lib COMPONENT Development)
-INSTALL(TARGETS mysqlclient DESTINATION lib COMPONENT Development)
+MYSQL_INSTALL_TARGETS(libmysql DESTINATION lib COMPONENT SharedLibraries)
-INSTALL_DEBUG_SYMBOLS(mysqlclient DESTINATION lib)
-INSTALL(TARGETS libmysql DESTINATION lib COMPONENT SharedLibraries)
-INSTALL_DEBUG_SYMBOLS(libmysql DESTINATION lib)
--- a/libmysqld/CMakeLists.txt
+++ b/libmysqld/CMakeLists.txt
@@ -173,9 +173,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)
+MYSQL_INSTALL_TARGETS(mysqlserver libmysqld 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)