From b19e99865ccf3e946ebe59bf09add8e0452904ac Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Sat, 29 Jan 2011 18:51:12 +0100 Subject: MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order to be able to build MSI based installer --- storage/maria/CMakeLists.txt | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) (limited to 'storage/maria/CMakeLists.txt') diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index 7724f9c5311..6ffc8d992b4 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -48,23 +48,25 @@ SET(ARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c MYSQL_STORAGE_ENGINE(ARIA) IF(NOT SOURCE_SUBLIBS) + ADD_DEPENDENCIES(aria GenError) -ADD_EXECUTABLE(aria_ftdump maria_ftdump.c) +MYSQL_ADD_EXECUTABLE(aria_ftdump maria_ftdump.c) TARGET_LINK_LIBRARIES(aria_ftdump aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(aria_chk maria_chk.c) +MYSQL_ADD_EXECUTABLE(aria_chk maria_chk.c) TARGET_LINK_LIBRARIES(aria_chk aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(aria_read_log maria_read_log.c) +MYSQL_ADD_EXECUTABLE(aria_read_log maria_read_log.c) TARGET_LINK_LIBRARIES(aria_read_log aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(aria_pack maria_pack.c) +MYSQL_ADD_EXECUTABLE(aria_pack maria_pack.c) TARGET_LINK_LIBRARIES(aria_pack aria myisam mysys dbug strings zlib wsock32) -ADD_EXECUTABLE(aria_dump_log maria_dump_log.c unittest/ma_loghandler_examples.c) +MYSQL_ADD_EXECUTABLE(aria_dump_log maria_dump_log.c unittest/ma_loghandler_examples.c) TARGET_LINK_LIBRARIES(aria_dump_log aria myisam mysys dbug strings zlib wsock32) + ADD_EXECUTABLE(ma_test1 ma_test1.c) TARGET_LINK_LIBRARIES(ma_test1 aria myisam mysys dbug strings zlib wsock32) @@ -79,15 +81,4 @@ TARGET_LINK_LIBRARIES(ma_rt_test aria myisam mysys dbug strings zlib wsock32) ADD_EXECUTABLE(ma_sp_test ma_sp_test.c) TARGET_LINK_LIBRARIES(ma_sp_test aria myisam mysys dbug strings zlib wsock32) - -IF(EMBED_MANIFESTS) - MYSQL_EMBED_MANIFEST("aria_ftdump" "asInvoker") - MYSQL_EMBED_MANIFEST("aria_chk" "asInvoker") - MYSQL_EMBED_MANIFEST("aria_read_log" "asInvoker") - MYSQL_EMBED_MANIFEST("aria_pack" "asInvoker") -ENDIF(EMBED_MANIFESTS) - -INSTALL(TARGETS aria_ftdump aria_chk aria_read_log aria_pack aria_dump_log - DESTINATION bin COMPONENT runtime) - ENDIF(NOT SOURCE_SUBLIBS) -- cgit v1.2.1