diff options
Diffstat (limited to 'databases/mysql80-server/files/patch-client_CMakeLists.txt')
| -rw-r--r-- | databases/mysql80-server/files/patch-client_CMakeLists.txt | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/databases/mysql80-server/files/patch-client_CMakeLists.txt b/databases/mysql80-server/files/patch-client_CMakeLists.txt index bbfb4249c799..41b4925911bc 100644 --- a/databases/mysql80-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql80-server/files/patch-client_CMakeLists.txt @@ -1,4 +1,4 @@ ---- client/CMakeLists.txt.orig 2021-03-22 08:44:50 UTC +--- client/CMakeLists.txt.orig 2021-09-28 11:46:34 UTC +++ client/CMakeLists.txt @@ -28,10 +28,13 @@ DISABLE_MISSING_PROFILE_WARNING() ## Subdirectory with common client code. @@ -11,18 +11,18 @@ +ENDIF() +IF(NOT WITHOUT_CLIENTLIBS) - MYSQL_ADD_EXECUTABLE(mysql - ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc - completion_hash.cc -@@ -41,6 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysql - client_query_attributes.cc + INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_SOURCE_DIR}/include + ) +@@ -47,6 +50,7 @@ MYSQL_ADD_EXECUTABLE(mysql + ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc LINK_LIBRARIES mysqlclient client_base ${EDITLINE_LIBRARY} ) +ENDIF() IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -57,6 +61,7 @@ IF(SOLARIS_SPARC AND MY_COMPILER_IS_SUNPRO AND +@@ -55,6 +59,7 @@ IF(NOT WITHOUT_SERVER) ) ENDIF() @@ -30,7 +30,7 @@ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc mysqltest/error_names.cc -@@ -73,6 +78,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest +@@ -71,6 +76,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest ENABLE_EXPORTS LINK_LIBRARIES mysqlclient ) @@ -40,7 +40,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc check/mysqlcheck_core.cc -@@ -248,7 +256,9 @@ ENDIF() +@@ -250,7 +258,9 @@ ENDIF() TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX) TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql) @@ -49,18 +49,18 @@ +IF(WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc - LINK_LIBRARIES mysqlclient -@@ -261,6 +271,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor + multi_factor_passwordopt-vars.cc +@@ -265,6 +275,9 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc LINK_LIBRARIES mysqlclient ) +ENDIF() + -+IF(NOT WITHOUT_SERVER) ++IF(NOT_WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc LINK_LIBRARIES mysqlclient -@@ -271,6 +284,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup +@@ -275,6 +288,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup path.cc LINK_LIBRARIES mysys ) |