diff options
| author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
|---|---|---|
| committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-09-20 17:17:32 +0300 |
| commit | dc0b8f7ada9df6ea4b40d28766a672581526d9d8 (patch) | |
| tree | 4b2b7364d1e622b3b02db3fb9d0c898fb9293a87 /client/CMakeLists.txt | |
| parent | 702d559fd5e19e9d0ef462c50c2da97360fc9def (diff) | |
| parent | 9141bb587892f3bfb59f0aad5eb8ef38e4310199 (diff) | |
| download | mariadb-git-dc0b8f7ada9df6ea4b40d28766a672581526d9d8.tar.gz | |
merge of mysql-5.5 into mysql-5.5-wl1054
Diffstat (limited to 'client/CMakeLists.txt')
| -rw-r--r-- | client/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index e36659d74bf..80c5bbd1c9f 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -64,7 +64,10 @@ MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) -ADD_EXECUTABLE(echo echo.c) +# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". +IF(WIN32) + MYSQL_ADD_EXECUTABLE(echo echo.c) +ENDIF(WIN32) SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap PROPERTIES HAS_CXX TRUE) |