Changeset View
Changeset View
Standalone View
Standalone View
databases/mysqlwsrep56-server/files/patch-client_CMakeLists.txt
| --- client/CMakeLists.txt.orig 2013-05-21 17:18:39.000000000 +0200 | --- client/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC | ||||
| +++ client/CMakeLists.txt 2013-06-10 15:43:33.000000000 +0200 | +++ client/CMakeLists.txt | ||||
| @@ -31,17 +31,20 @@ | @@ -31,17 +31,20 @@ INCLUDE_DIRECTORIES( | ||||
| COPY_OPENSSL_DLLS(copy_openssl_client) | COPY_OPENSSL_DLLS(copy_openssl_client) | ||||
| ADD_DEFINITIONS(${SSL_DEFINES}) | ADD_DEFINITIONS(${SSL_DEFINES}) | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) | MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) | ||||
| TARGET_LINK_LIBRARIES(mysql mysqlclient) | TARGET_LINK_LIBRARIES(mysql mysqlclient) | ||||
| IF(UNIX) | IF(UNIX) | ||||
| TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) | TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) | ||||
| ENDIF(UNIX) | ENDIF(UNIX) | ||||
| +ENDIF() | +ENDIF() | ||||
| MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) | MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) | ||||
| SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") | SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||||
| TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) | TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) | MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) | ||||
| TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) | TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) | ||||
| @@ -50,17 +53,21 @@ | @@ -51,17 +54,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli | ||||
| MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) | MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) | ||||
| SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") | |||||
| TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) | TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) | ||||
| +ENDIF() | +ENDIF() | ||||
| MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) | MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) | ||||
| TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) | TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) | ||||
| ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) | ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) | MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) | ||||
| TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) | TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) | ||||
| +ENDIF() | +ENDIF() | ||||
| MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) | MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) | ||||
| TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) | TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) | MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) | ||||
| TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) | TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) | ||||
| @@ -73,6 +80,7 @@ | @@ -74,6 +81,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli | ||||
| MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) | MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) | ||||
| TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) | TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) | ||||
| +ENDIF() | +ENDIF() | ||||
| # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". | # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". | ||||
| IF(WIN32) | IF(WIN32) | ||||
| @@ -82,11 +90,6 @@ | @@ -83,11 +91,6 @@ ENDIF(WIN32) | ||||
| SET_TARGET_PROPERTIES ( | SET_TARGET_PROPERTIES ( | ||||
| mysql_plugin | mysql_plugin | ||||
| mysql_upgrade | mysql_upgrade | ||||
| - mysqlcheck | - mysqlcheck | ||||
| - mysqldump | - mysqldump | ||||
| - mysqlimport | - mysqlimport | ||||
| - mysqlshow | - mysqlshow | ||||
| - mysqlslap | - mysqlslap | ||||
| PROPERTIES HAS_CXX TRUE) | PROPERTIES HAS_CXX TRUE) | ||||
| ADD_DEFINITIONS(-DHAVE_DLOPEN) | ADD_DEFINITIONS(-DHAVE_DLOPEN) | ||||