diff options
author | unknown <kent@kent-amd64.(none)> | 2007-08-03 22:57:21 +0200 |
---|---|---|
committer | unknown <kent@kent-amd64.(none)> | 2007-08-03 22:57:21 +0200 |
commit | 6f43cf82c8ebe9e7851bd9409fd3db6c84e17ef5 (patch) | |
tree | fb563e643d6b42feb801c036272d89d964b5ed48 /extra/CMakeLists.txt | |
parent | 97bb72f139b95cf2ecd2c8ed0ac9a3b449ef8977 (diff) | |
parent | 29bd01e6c11c0d9df7f556f157b1b00e06306f60 (diff) | |
download | mariadb-git-6f43cf82c8ebe9e7851bd9409fd3db6c84e17ef5.tar.gz |
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-new
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
BitKeeper/deleted/.del-README~1:
SCCS merged
BitKeeper/deleted/.del-configure.js:
ul
dbug/CMakeLists.txt:
SCCS merged
extra/CMakeLists.txt:
SCCS merged
extra/yassl/CMakeLists.txt:
SCCS merged
extra/yassl/taocrypt/CMakeLists.txt:
SCCS merged
scripts/CMakeLists.txt:
SCCS merged
server-tools/instance-manager/CMakeLists.txt:
SCCS merged
sql/CMakeLists.txt:
SCCS merged
storage/myisam/CMakeLists.txt:
SCCS merged
Diffstat (limited to 'extra/CMakeLists.txt')
-rwxr-xr-x | extra/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 1722c9da5f2..42561a97888 100755 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -20,7 +20,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_EXECUTABLE(comp_err comp_err.c) -TARGET_LINK_LIBRARIES(comp_err dbug mysys strings zlib wsock32) +TARGET_LINK_LIBRARIES(comp_err debug dbug mysys strings zlib wsock32) GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION) @@ -39,13 +39,13 @@ ADD_CUSTOM_TARGET(GenError DEPENDS ${PROJECT_SOURCE_DIR}/include/mysqld_error.h) ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) -TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt wsock32) +TARGET_LINK_LIBRARIES(my_print_defaults strings mysys debug dbug taocrypt wsock32) ADD_EXECUTABLE(perror perror.c) -TARGET_LINK_LIBRARIES(perror strings mysys dbug wsock32) +TARGET_LINK_LIBRARIES(perror strings mysys debug dbug wsock32) ADD_EXECUTABLE(replace replace.c) -TARGET_LINK_LIBRARIES(replace strings mysys dbug wsock32) +TARGET_LINK_LIBRARIES(replace strings mysys debug dbug wsock32) IF(EMBED_MANIFESTS) MYSQL_EMBED_MANIFEST("myTest" "asInvoker") |