c4ac829e97
Typo in patchfile leads to skip mysql_secure_installation. Bring it back. PR: 262123 Submitted by: amdmi3 Approved by: joneum (implicit)
70 lines
1.8 KiB
Text
70 lines
1.8 KiB
Text
--- 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.
|
|
ADD_SUBDIRECTORY(base)
|
|
## Subdirectory for mysqlpump code.
|
|
+IF(WITHOUT_SERVER)
|
|
ADD_SUBDIRECTORY(dump)
|
|
## Subdirectory for mysql_migrate_keyring code.
|
|
ADD_SUBDIRECTORY(migrate_keyring)
|
|
+ENDIF()
|
|
|
|
+IF(NOT WITHOUT_CLIENTLIBS)
|
|
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
|
|
@@ -55,6 +59,7 @@ IF(NOT_WITHOUT_SERVER)
|
|
)
|
|
ENDIF()
|
|
|
|
+IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysqltest
|
|
mysqltest.cc
|
|
mysqltest/error_names.cc
|
|
@@ -71,6 +76,9 @@ MYSQL_ADD_EXECUTABLE(mysqltest
|
|
ENABLE_EXPORTS
|
|
LINK_LIBRARIES mysqlclient
|
|
)
|
|
+ENDIF()
|
|
+
|
|
+IF(WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysqlcheck
|
|
check/mysqlcheck.cc
|
|
check/mysqlcheck_core.cc
|
|
@@ -250,7 +258,9 @@ ENDIF()
|
|
|
|
TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
|
|
TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
|
|
+ENDIF()
|
|
|
|
+IF(WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysqladmin
|
|
mysqladmin.cc
|
|
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)
|
|
MYSQL_ADD_EXECUTABLE(mysql_secure_installation
|
|
mysql_secure_installation.cc
|
|
LINK_LIBRARIES mysqlclient
|
|
@@ -275,6 +288,7 @@ MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup
|
|
path.cc
|
|
LINK_LIBRARIES mysys
|
|
)
|
|
+ENDIF()
|
|
|
|
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
|
|
IF(WIN32)
|