diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:12:26 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-09 17:12:26 +0200 |
| commit | cfeedbfd3e292f61c7da8f0a7f86307cbeeddb64 (patch) | |
| tree | 3629d1de148b14915a35a21f809e1a2ea6a08619 /client/CMakeLists.txt | |
| parent | bff1af983ad7b0bed6c3973e4d13297df5fe2791 (diff) | |
| parent | 16c4b3c68b06653592a9500050ad977a38f4ebae (diff) | |
| download | mariadb-git-cfeedbfd3e292f61c7da8f0a7f86307cbeeddb64.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'client/CMakeLists.txt')
| -rw-r--r-- | client/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 1bf466c1e47..e4643ad9358 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -51,6 +51,7 @@ MYSQL_ADD_EXECUTABLE(mysqldump mysqldump.c ../sql-common/my_user.c) TARGET_LINK_LIBRARIES(mysqldump mysqlclient) MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) +SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) |