diff options
author | unknown <df@pippilotta.erinye.com> | 2007-06-06 14:20:06 +0200 |
---|---|---|
committer | unknown <df@pippilotta.erinye.com> | 2007-06-06 14:20:06 +0200 |
commit | 0cbe9cd771d4935f1e6e45ca12c2f6147b1f2ccf (patch) | |
tree | e367a6e84a3de6e59f6dc703812df215dd518109 /client | |
parent | 893460d0eededa2478f8a2456e8f845da8d09d2e (diff) | |
parent | 9c76ac256716bd148b8f4f9212f6e8eb083e8507 (diff) | |
download | mariadb-git-0cbe9cd771d4935f1e6e45ca12c2f6147b1f2ccf.tar.gz |
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
Diffstat (limited to 'client')
-rw-r--r-- | client/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 8ec8b0111b0..69d39886e9a 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -20,6 +20,10 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") # 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(-DUSING_CMAKE) + +# USE_TLS needed because of bug#28860 +ADD_DEFINITIONS(-DUSE_TLS) + INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/extra/yassl/include |