diff options
author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-17 14:41:50 +0100 |
---|---|---|
committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2009-12-17 14:41:50 +0100 |
commit | 555d46ea7f1c02edf32b2102a3ff3f8dff7aa147 (patch) | |
tree | b9698e003a32f65faf28d6032f377916cf93b648 /extra/CMakeLists.txt | |
parent | 2ff2d1873a989e1c7f304f64c57ff236d7c48750 (diff) | |
download | mariadb-git-555d46ea7f1c02edf32b2102a3ff3f8dff7aa147.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 'extra/CMakeLists.txt')
-rwxr-xr-x | extra/CMakeLists.txt | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 90f28698564..479fb8cbd71 100755 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -49,14 +49,14 @@ ADD_CUSTOM_TARGET(GenError ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys ${PROJECT_SOURCE_DIR}/sql/share/errmsg-utf8.txt) -ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) +MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys) -ADD_EXECUTABLE(perror perror.c) +MYSQL_ADD_EXECUTABLE(perror perror.c) ADD_DEPENDENCIES(perror GenError) TARGET_LINK_LIBRARIES(perror mysys) -ADD_EXECUTABLE(resolveip resolveip.c) +MYSQL_ADD_EXECUTABLE(resolveip resolveip.c) TARGET_LINK_LIBRARIES(resolveip mysys) IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS") INCLUDE(CheckFunctionExists) @@ -69,15 +69,12 @@ ENDIF() ADD_EXECUTABLE(replace replace.c) TARGET_LINK_LIBRARIES(replace mysys) IF(UNIX) - ADD_EXECUTABLE(innochecksum innochecksum.c) - - ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) + + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) - - ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) + + MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) - - MYSQL_INSTALL_TARGETS(innochecksum mysql_waitpid resolve_stack_dump DESTINATION bin) ENDIF() -MYSQL_INSTALL_TARGETS(perror resolveip my_print_defaults DESTINATION bin) |