diff options
| author | knielsen@mysql.com <> | 2006-02-10 13:29:01 +0100 |
|---|---|---|
| committer | knielsen@mysql.com <> | 2006-02-10 13:29:01 +0100 |
| commit | abcf6ccebbb3bd4dbceba36759f4bb14cdf6ba78 (patch) | |
| tree | 15a8de8e5276971a6e714a11510abfb478bac0e9 /win | |
| parent | dc2f25a8f1ff2b2101c8a773e46800b7a26cf612 (diff) | |
| download | mariadb-git-abcf6ccebbb3bd4dbceba36759f4bb14cdf6ba78.tar.gz | |
Changes to make testsuite run in CMake build tree.
Diffstat (limited to 'win')
| -rw-r--r-- | win/cmakefiles/client | 32 | ||||
| -rw-r--r-- | win/cmakefiles/extra | 2 |
2 files changed, 32 insertions, 2 deletions
diff --git a/win/cmakefiles/client b/win/cmakefiles/client index 7c0c6f2400b..9c5582f58ff 100644 --- a/win/cmakefiles/client +++ b/win/cmakefiles/client @@ -1,11 +1,16 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") -ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_CLIENT) +# The old Windows build method used renamed (.cc -> .cpp) source files, fails +# in #include in mysqlbinlog.cc. So disable that using the USING_CMAKE define. +ADD_DEFINITIONS(-DUSE_TLS -DUSING_CMAKE) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/extra/yassl/include - ${CMAKE_SOURCE_DIR}/libmysql) + ${CMAKE_SOURCE_DIR}/libmysql + ${CMAKE_SOURCE_DIR}/regex + ${CMAKE_SOURCE_DIR}/sql + ${CMAKE_SOURCE_DIR}/strings) ADD_LIBRARY(mysqlclient ../mysys/array.c ../strings/bchange.c ../strings/bmove.c ../strings/bmove_upp.c ../mysys/charset-def.c ../mysys/charset.c @@ -47,3 +52,26 @@ ADD_DEPENDENCIES(mysqlclient GenError) ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) LINK_DIRECTORIES(${MYSQL_BINARY_DIR}/mysys ${MYSQL_BINARY_DIR}/zlib) TARGET_LINK_LIBRARIES(mysql mysqlclient mysys yassl zlib dbug yassl taocrypt wsock32) + +ADD_EXECUTABLE(mysqltest mysqltest.c) +TARGET_LINK_LIBRARIES(mysqltest mysqlclient mysys yassl zlib dbug regex wsock32) + +ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) +TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient dbug yassl zlib wsock32) + +ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c) +TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl zlib wsock32) + +ADD_EXECUTABLE(mysqlimport mysqlimport.c) +TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl zlib wsock32) + +ADD_EXECUTABLE(mysqlshow mysqlshow.c) +TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl zlib wsock32) + +ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc ../mysys/mf_tempdir.c ../mysys/my_new.cc + ../mysys/my_bit.c ../mysys/my_bitmap.c ../mysys/my_vle.c + ../mysys/base64.c) +TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient dbug yassl zlib wsock32) + +ADD_EXECUTABLE(mysqladmin mysqladmin.cc) +TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl zlib wsock32) diff --git a/win/cmakefiles/extra b/win/cmakefiles/extra index 40327eac0ad..328e20a696a 100644 --- a/win/cmakefiles/extra +++ b/win/cmakefiles/extra @@ -19,3 +19,5 @@ ADD_CUSTOM_TARGET(GenError +ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) +TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt odbc32 odbccp32 wsock32) |