summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorVladislav Vaintroub <vvaintroub@mysql.com>2009-12-17 14:41:50 +0100
committerVladislav Vaintroub <vvaintroub@mysql.com>2009-12-17 14:41:50 +0100
commiteb3c44030bf398ddaf033be1a3b1b163faa9bce3 (patch)
treeb9698e003a32f65faf28d6032f377916cf93b648 /storage
parent07bfd2617db894f9a6a4ad5998941d3517974bb7 (diff)
downloadmariadb-git-eb3c44030bf398ddaf033be1a3b1b163faa9bce3.tar.gz
Replace ADD_EXECUTABLE with MYSQL_ADD_EXECUTABLE for binaries that are installed.
MYSQL_ADD_EXECUTABLE will instructs CPack where to install the exe. On Windows, it also adds version resource and if -DSIGNCODE was given, will sign the exe in packaging step.
Diffstat (limited to 'storage')
-rwxr-xr-xstorage/myisam/CMakeLists.txt29
1 files changed, 14 insertions, 15 deletions
diff --git a/storage/myisam/CMakeLists.txt b/storage/myisam/CMakeLists.txt
index 9359eca0ccc..4b7007055d8 100755
--- a/storage/myisam/CMakeLists.txt
+++ b/storage/myisam/CMakeLists.txt
@@ -31,38 +31,37 @@ MYSQL_ADD_PLUGIN(myisam ${MYISAM_SOURCES}
MANDATORY
RECOMPILE_FOR_EMBEDDED)
-ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c)
-TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys)
+TARGET_LINK_LIBRARIES(myisam mysys)
-ADD_EXECUTABLE(myisamchk myisamchk.c)
-TARGET_LINK_LIBRARIES(myisamchk myisam mysys)
+MYSQL_ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c)
+TARGET_LINK_LIBRARIES(myisam_ftdump myisam)
-ADD_EXECUTABLE(myisamlog myisamlog.c)
-TARGET_LINK_LIBRARIES(myisamlog myisam mysys)
+MYSQL_ADD_EXECUTABLE(myisamchk myisamchk.c)
+TARGET_LINK_LIBRARIES(myisamchk myisam)
-ADD_EXECUTABLE(myisampack myisampack.c)
+MYSQL_ADD_EXECUTABLE(myisamlog myisamlog.c)
+TARGET_LINK_LIBRARIES(myisamlog myisam)
-TARGET_LINK_LIBRARIES(myisampack myisam mysys)
+MYSQL_ADD_EXECUTABLE(myisampack myisampack.c)
+TARGET_LINK_LIBRARIES(myisampack myisam)
IF(WITH_UNIT_TESTS AND FALSE)
ADD_EXECUTABLE(mi_test1 mi_test1.c)
- TARGET_LINK_LIBRARIES(mi_test1 myisam mysys)
+ TARGET_LINK_LIBRARIES(mi_test1 myisam)
ADD_EXECUTABLE(mi_test2 mi_test2.c)
- TARGET_LINK_LIBRARIES(mi_test2 myisam mysys)
+ TARGET_LINK_LIBRARIES(mi_test2 myisam)
ADD_EXECUTABLE(mi_test3 mi_test3.c)
- TARGET_LINK_LIBRARIES(mi_test3 myisam mysys)
+ TARGET_LINK_LIBRARIES(mi_test3 myisam)
ADD_EXECUTABLE(sp_test sp_test.c)
- TARGET_LINK_LIBRARIES(sp_test myisam mysys)
+ TARGET_LINK_LIBRARIES(sp_test myisam)
ADD_EXECUTABLE(rt_test rt_test.c)
- TARGET_LINK_LIBRARIES(rt_test myisam mysys)
+ TARGET_LINK_LIBRARIES(rt_test myisam)
ENDIF()
IF (MSVC)
SET_TARGET_PROPERTIES(myisamchk myisampack PROPERTIES LINK_FLAGS "setargv.obj")
ENDIF()
-
-MYSQL_INSTALL_TARGETS(myisamchk myisamlog myisampack myisam_ftdump DESTINATION bin)