From 0f51f460347883b71d2502928b8d6a346e8f9f35 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Mon, 28 Mar 2011 17:01:40 +0200 Subject: CMake/code signing: Use MYSQL_INSTALL_TARGETS() macro for DLLs (libmysql and libmysqld) to ensure that libraries are signed, if signing is requested. --- libmysql/CMakeLists.txt | 7 ++----- 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 44360b5dd44..412902f5746 100644 --- 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) -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) -- cgit v1.2.1