diff options
| author | unknown <joerg@trift2.> | 2007-08-02 21:18:24 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-08-02 21:18:24 +0200 |
| commit | ee37c3a3a5273a1c54725d943d272922f8a60b01 (patch) | |
| tree | 87678d6244845f92541f99c47ad5ed1149f609b9 /tests/CMakeLists.txt | |
| parent | 88a8e461abbd9aafe6cf984928857e0c0b416741 (diff) | |
| parent | 88032f4cce8733253c04ebd385c0d87f07a5b52a (diff) | |
| download | mariadb-git-ee37c3a3a5273a1c54725d943d272922f8a60b01.tar.gz | |
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into trift2.:/MySQL/M51/push-5.1
BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~99a50df6:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~ef945345:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01:
Auto merged
dbug/CMakeLists.txt:
Auto merged
tests/CMakeLists.txt:
Auto merged
zlib/CMakeLists.txt:
Auto merged
client/CMakeLists.txt:
Will be re-applied using "patch".
libmysql/CMakeLists.txt:
Will be re-applied using "patch".
mysys/CMakeLists.txt:
Will be re-applied using "patch".
sql/CMakeLists.txt:
Will be re-applied using "patch".
Diffstat (limited to 'tests/CMakeLists.txt')
| -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) |