diff options
Diffstat (limited to 'databases/mysql57-client/files/patch-client_CMakeLists.txt')
| -rw-r--r-- | databases/mysql57-client/files/patch-client_CMakeLists.txt | 51 |
1 files changed, 31 insertions, 20 deletions
diff --git a/databases/mysql57-client/files/patch-client_CMakeLists.txt b/databases/mysql57-client/files/patch-client_CMakeLists.txt index f3a7372b69f7..5b0e752138e7 100644 --- a/databases/mysql57-client/files/patch-client_CMakeLists.txt +++ b/databases/mysql57-client/files/patch-client_CMakeLists.txt @@ -1,27 +1,28 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 -@@ -39,9 +39,11 @@ - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) +--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ client/CMakeLists.txt +@@ -121,6 +121,7 @@ IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) + IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysql_upgrade + upgrade/program.cc +@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS( + TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) + ENDIF() +ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -53,15 +55,19 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) - +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) + SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) +ENDIF() + ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) + TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) +@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) @@ -31,13 +32,23 @@ +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -82,8 +88,6 @@ + ADD_COMPILE_FLAGS( +@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli + MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) + TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) + TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) ++ENDIF() + + IF(UNIX AND NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysql_install_db +@@ -196,7 +204,6 @@ IF(WIN32) ENDIF(WIN32) SET_TARGET_PROPERTIES ( -- mysql_plugin -- mysql_upgrade +- mysql_plugin mysqlcheck mysqldump mysqlimport |