Changeset View
Changeset View
Standalone View
Standalone View
databases/percona57-server/files/patch-client_CMakeLists.txt
- This file was added.
| Property | Old Value | New Value |
|---|---|---|
| fbsd:nokeywords | null | yes \ No newline at end of property |
| svn:eol-style | null | native \ No newline at end of property |
| svn:mime-type | null | text/plain \ No newline at end of property |
| --- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC | |||||
| +++ client/CMakeLists.txt | |||||
| @@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil | |||||
| ## Subdirectory with common client code. | |||||
| ADD_SUBDIRECTORY(base) | |||||
| -## Subdirectory for mysqlpump code. | |||||
| -ADD_SUBDIRECTORY(dump) | |||||
| ## We will need libeay32.dll and ssleay32.dll when running client executables. | |||||
| COPY_OPENSSL_DLLS(copy_openssl_client) | |||||
| @@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client) | |||||
| INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) | |||||
| ADD_DEFINITIONS(${SSL_DEFINES}) | |||||
| +IF(FALSE) | |||||
| MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc) | |||||
| TARGET_LINK_LIBRARIES(mysql perconaserverclient) | |||||
| IF(UNIX) | |||||
| TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) | |||||
| ENDIF(UNIX) | |||||
| +ENDIF() | |||||
| IF(NOT WITHOUT_SERVER) | |||||
| MYSQL_ADD_EXECUTABLE(mysql_upgrade | |||||
| @@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest perconas | |||||
| ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) | |||||
| TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient) | |||||
| +IF(FALSE) | |||||
| MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) | |||||
| TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) | |||||
| @@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport percon | |||||
| MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) | |||||
| TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) | |||||
| +ENDIF() | |||||
| MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) | |||||
| TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) | |||||
| +IF(FALSE) | |||||
| MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) | |||||
| ADD_COMPILE_FLAGS( | |||||
| mysqlbinlog.cc | |||||
| @@ -97,9 +100,12 @@ TARGET_LINK_LIBRARIES(mysqlslap perconas | |||||
| MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) | |||||
| TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient) | |||||
| +ENDIF() | |||||
| +IF(FALSE) | |||||
| MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) | |||||
| TARGET_LINK_LIBRARIES(mysql_secure_installation perconaserverclient) | |||||
| +ENDIF() | |||||
| IF(UNIX AND NOT WITHOUT_SERVER) | |||||
| MYSQL_ADD_EXECUTABLE(mysql_install_db | |||||
| @@ -112,9 +118,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) | |||||
| ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) | |||||
| ENDIF() | |||||
| +IF(FALSE) | |||||
| MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) | |||||
| TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) | |||||
| SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX) | |||||
| +ENDIF() | |||||
| # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". | |||||
| IF(WIN32) | |||||
| @@ -123,11 +131,6 @@ ENDIF(WIN32) | |||||
| SET_TARGET_PROPERTIES ( | |||||
| mysql_plugin | |||||
| - mysqlcheck | |||||
| - mysqldump | |||||
| - mysqlimport | |||||
| - mysqlshow | |||||
| - mysqlslap | |||||
| PROPERTIES HAS_CXX TRUE) | |||||
| ADD_DEFINITIONS(-DHAVE_DLOPEN) | |||||