diff options
| -rw-r--r-- | win/cmakefiles/client | 2 | ||||
| -rw-r--r-- | win/cmakefiles/libmysql | 2 | ||||
| -rw-r--r-- | win/cmakefiles/regex | 3 | ||||
| -rw-r--r-- | win/cmakefiles/strings | 5 | ||||
| -rw-r--r-- | win/cmakefiles/tests | 2 | ||||
| -rw-r--r-- | win/cmakefiles/vio | 6 | ||||
| -rw-r--r-- | win/cmakefiles/zlib | 6 |
7 files changed, 12 insertions, 14 deletions
diff --git a/win/cmakefiles/client b/win/cmakefiles/client index 7914f8aac1b..5da9189b0ae 100644 --- a/win/cmakefiles/client +++ b/win/cmakefiles/client @@ -77,4 +77,4 @@ ADD_EXECUTABLE(mysqladmin mysqladmin.cc) TARGET_LINK_LIBRARIES(mysqladmin mysqlclient mysys dbug yassl zlib wsock32) ADD_EXECUTABLE(mysqlslap mysqlslap.c) -TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib wsock32) +TARGET_LINK_LIBRARIES(mysqlslap mysqlclient mysys zlib wsock32 dbug) diff --git a/win/cmakefiles/libmysql b/win/cmakefiles/libmysql index a1953244c0a..cb3453fc222 100644 --- a/win/cmakefiles/libmysql +++ b/win/cmakefiles/libmysql @@ -45,7 +45,7 @@ ADD_LIBRARY(libmysql MODULE dll.c libmysql.def ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c) -ADD_DEPENDENCIES(libmysql GenError zlib) +ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib) TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32) # ToDo: We should move the mytest.c program out in libmysql/ diff --git a/win/cmakefiles/regex b/win/cmakefiles/regex index 77b3d05f55e..e00f339b3b9 100644 --- a/win/cmakefiles/regex +++ b/win/cmakefiles/regex @@ -1,6 +1,5 @@ -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") -ADD_DEFINITIONS(-D_WINDOWS -D__WIN__) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_LIBRARY(regex debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c) diff --git a/win/cmakefiles/strings b/win/cmakefiles/strings index 8a2004ac26a..7b78e5f6b39 100644 --- a/win/cmakefiles/strings +++ b/win/cmakefiles/strings @@ -1,7 +1,6 @@ -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") -ADD_DEFINITIONS(-D_WINDOWS -D__WIN__) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_LIBRARY(strings bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c ctype-bin.c ctype-cp932.c ctype-czech.c ctype-euc_kr.c ctype-eucjpms.c ctype-extra.c ctype-gb2312.c ctype-gbk.c diff --git a/win/cmakefiles/tests b/win/cmakefiles/tests index cde41dca85c..1b627329028 100644 --- a/win/cmakefiles/tests +++ b/win/cmakefiles/tests @@ -6,4 +6,4 @@ ADD_DEFINITIONS("-DMYSQL_CLIENT") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_EXECUTABLE(mysql_client_test mysql_client_test.c) -TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient zlib wsock32) +TARGET_LINK_LIBRARIES(mysql_client_test dbug mysqlclient zlib wsock32) diff --git a/win/cmakefiles/vio b/win/cmakefiles/vio index 91b51e3793d..a3cbb304289 100644 --- a/win/cmakefiles/vio +++ b/win/cmakefiles/vio @@ -1,6 +1,6 @@ -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX -DUSE_SYMDIR") +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -DSAFEMALLOC -DSAFE_MUTEX") -ADD_DEFINITIONS(-D_WINDOWS -D__WIN__) +ADD_DEFINITIONS(-DUSE_SYMDIR) INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/extra/yassl/include) ADD_LIBRARY(vio vio.c viosocket.c viossl.c viosslfactories.c) diff --git a/win/cmakefiles/zlib b/win/cmakefiles/zlib index 2a3abacd3c2..53560adf6d1 100644 --- a/win/cmakefiles/zlib +++ b/win/cmakefiles/zlib @@ -1,7 +1,7 @@ -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D __WIN32__") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D __WIN32__") +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG") -ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_CLIENT -D_WINDOWS -D__WIN__) +ADD_DEFINITIONS(-DUSE_TLS -DMYSQL_CLIENT -D__WIN32__) ADD_LIBRARY(zlib adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c infback.c inffast.c inffast.h inffixed.h inflate.c inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h zlib.h zutil.c zutil.h) |