diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-08-02 15:39:34 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-08-02 15:39:34 +0200 |
| commit | 6e20710c6c2fd7cbf356a6a6a866c38ef39ef3a3 (patch) | |
| tree | ddc45f644defc1eae6a7db29b45cfe3c00c22cfc /tests | |
| parent | 4fa1ad315fed9a70418d031f791f612e51fabb1d (diff) | |
| parent | def8d6b36399708c7e1dd28d13178b303ed14d14 (diff) | |
| download | mariadb-git-6e20710c6c2fd7cbf356a6a6a866c38ef39ef3a3.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/CMakeLists.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7559ca9ec6b..2093fc0da36 100755 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -13,15 +13,15 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") -SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +# About "mysqlclient_notls", see note in "client/CMakeLists.txt" +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") 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 dbug mysys mysqlclient yassl taocrypt zlib wsock32) +ADD_EXECUTABLE(mysql_client_test mysql_client_test.c ../mysys/my_memmem.c) +TARGET_LINK_LIBRARIES(mysql_client_test mysqlclient_notls wsock32) ADD_EXECUTABLE(bug25714 bug25714.c) -TARGET_LINK_LIBRARIES(bug25714 dbug mysys mysqlclient yassl taocrypt zlib wsock32) +TARGET_LINK_LIBRARIES(bug25714 mysqlclient_notls wsock32) |