mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 05:10:29 -04:00
c7fbbf15f3
Release notes: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-25.html https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-24.html PR: 255937 Submitted by: delphij@ Approved by joneum@ (implicit) MFH: 2021Q2
70 lines
1.8 KiB
Text
70 lines
1.8 KiB
Text
--- client/CMakeLists.txt.orig 2021-03-22 08:44:50 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)
|
|
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
|
|
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
|
|
)
|
|
ENDIF()
|
|
|
|
+IF(NOT WITHOUT_SERVER)
|
|
MYSQL_ADD_EXECUTABLE(mysqltest
|
|
mysqltest.cc
|
|
mysqltest/error_names.cc
|
|
@@ -73,6 +78,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
|
|
@@ -248,7 +256,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
|
|
LINK_LIBRARIES mysqlclient
|
|
@@ -261,6 +271,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
|
|
@@ -271,6 +284,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)
|