1--- client/CMakeLists.txt.orig	2024-09-17 10:40:37 UTC
2+++ client/CMakeLists.txt
3@@ -26,9 +26,12 @@ DISABLE_MISSING_PROFILE_WARNING()
4 # We are not interesting in profiling clients.
5 DISABLE_MISSING_PROFILE_WARNING()
6
7+IF(WITHOUT_SERVER)
8 ## Subdirectory for mysql_migrate_keyring code.
9 ADD_SUBDIRECTORY(migrate_keyring)
10+ENDIF()
11
12+IF(WITHOUT_SERVER)
13 MYSQL_ADD_EXECUTABLE(mysql
14   ${CMAKE_SOURCE_DIR}/sql-common/net_ns.cc
15   completion_hash.cc
16@@ -42,7 +45,9 @@ MYSQL_ADD_EXECUTABLE(mysql
17   ${CMAKE_SOURCE_DIR}/sql-common/sql_string.cc
18   LINK_LIBRARIES mysqlclient ${EDITLINE_LIBRARY}
19   )
20+ENDIF()
21
22+IF(NOT WITHOUT_SERVER)
23 MYSQL_ADD_EXECUTABLE(mysqltest
24   mysqltest.cc
25   mysqltest/error_names.cc
26@@ -64,6 +69,9 @@ ENDIF()
27   TARGET_LINK_OPTIONS(mysqltest PRIVATE -Wno-error=stringop-overflow)
28 ENDIF()
29
30+ENDIF()
31+
32+IF(WITHOUT_SERVER)
33 MYSQL_ADD_EXECUTABLE(mysqlcheck
34   check/mysqlcheck.cc
35   check/mysqlcheck_core.cc
36@@ -289,7 +297,9 @@ TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE
37
38 TARGET_COMPILE_DEFINITIONS(mysqlbinlog PRIVATE DISABLE_PSI_MUTEX)
39 TARGET_INCLUDE_DIRECTORIES(mysqlbinlog PRIVATE ${CMAKE_SOURCE_DIR}/sql)
40+ENDIF()
41
42+IF(WITHOUT_SERVER)
43 MYSQL_ADD_EXECUTABLE(mysqladmin
44   mysqladmin.cc
45   multi_factor_passwordopt-vars.cc
46@@ -304,10 +314,14 @@ MYSQL_ADD_EXECUTABLE(mysql_config_editor
47   mysql_config_editor.cc
48   LINK_LIBRARIES mysqlclient
49   )
50+ENDIF()
51+
52+IF(NOT WITHOUT_SERVER)
53 MYSQL_ADD_EXECUTABLE(mysql_secure_installation
54   mysql_secure_installation.cc
55   LINK_LIBRARIES mysqlclient
56   )
57+ENDIF()
58
59 # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/".
60 IF(WIN32)
61