b8d235ae4f
Changelog: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-28.html Sponsored by: Netzkommune GmbH
86 lines
2.3 KiB
Plaintext
86 lines
2.3 KiB
Plaintext
--- CMakeLists.txt.orig 2021-12-17 16:07:27 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -1665,7 +1665,7 @@ IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
|
|
ENDIF()
|
|
|
|
IF(WITH_AUTHENTICATION_LDAP)
|
|
- IF(LINUX AND KNOWN_CUSTOM_LIBRARIES)
|
|
+ IF(LINUX OR FREEBSD AND KNOWN_CUSTOM_LIBRARIES)
|
|
# LDAP / SASL / KERBEROS / SSL must all be "system" or "custom", not a mix.
|
|
IF(WITH_LDAP STREQUAL "system" OR
|
|
WITH_SASL STREQUAL "system" OR
|
|
@@ -1714,10 +1714,10 @@ IF(WITH_AUTHENTICATION_KERBEROS)
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
-# Add system/bundled editline.
|
|
-MYSQL_CHECK_EDITLINE()
|
|
# Add libevent
|
|
-MYSQL_CHECK_LIBEVENT()
|
|
+IF(NOT WITHOUT_SERVER)
|
|
+ MYSQL_CHECK_LIBEVENT()
|
|
+ENDIF()
|
|
# Add lz4 library
|
|
MYSQL_CHECK_LZ4()
|
|
# Add icu library
|
|
@@ -1917,7 +1917,9 @@ ADD_CUSTOM_TARGET(plugin_all)
|
|
# Utility target to build every target added with MYSQL_ADD_COMPONENT.
|
|
ADD_CUSTOM_TARGET(component_all)
|
|
|
|
-ADD_SUBDIRECTORY(include)
|
|
+IF(NOT WITHOUT_CLIENTLIBS)
|
|
+ ADD_SUBDIRECTORY(include)
|
|
+ENDIF(NOT WITHOUT_CLIENTLIBS)
|
|
ADD_SUBDIRECTORY(strings)
|
|
ADD_SUBDIRECTORY(vio)
|
|
ADD_SUBDIRECTORY(mysys)
|
|
@@ -1962,12 +1964,17 @@ IF(WITH_UNIT_TESTS)
|
|
ADD_SUBDIRECTORY(unittest/mytap/t)
|
|
ENDIF()
|
|
|
|
-ADD_SUBDIRECTORY(client)
|
|
+IF(NOT WITHOUT_TOOLS)
|
|
+ # Add system/bundled editline
|
|
+ MYSQL_CHECK_EDITLINE()
|
|
+ ADD_SUBDIRECTORY(client)
|
|
+ENDIF(NOT WITHOUT_TOOLS)
|
|
+
|
|
ADD_SUBDIRECTORY(utilities)
|
|
-ADD_SUBDIRECTORY(share)
|
|
ADD_SUBDIRECTORY(libservices)
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
+ ADD_SUBDIRECTORY(share)
|
|
ADD_SUBDIRECTORY(testclients)
|
|
ADD_SUBDIRECTORY(sql)
|
|
ENDIF()
|
|
@@ -2020,11 +2027,11 @@ ENDIF()
|
|
# scripts/mysql_config depends on client and server targets loaded above.
|
|
# It is referenced by some of the directories below, so we insert it here.
|
|
ADD_SUBDIRECTORY(scripts)
|
|
+ADD_SUBDIRECTORY(support-files)
|
|
|
|
IF(NOT WITHOUT_SERVER)
|
|
ADD_SUBDIRECTORY(mysql-test)
|
|
ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
|
|
- ADD_SUBDIRECTORY(support-files)
|
|
IF(WITH_INTERNAL)
|
|
ADD_SUBDIRECTORY(internal)
|
|
ENDIF()
|
|
@@ -2134,6 +2141,7 @@ IF(PACK_SEPARATE_COMPONENTS)
|
|
SET(CPACK_COMPONENTS_GROUPING IGNORE)
|
|
ENDIF()
|
|
|
|
+IF(FALSE)
|
|
IF(UNIX)
|
|
INSTALL(FILES
|
|
Docs/mysql.info
|
|
@@ -2168,6 +2176,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
PATTERN "sp-imp-spec.txt" EXCLUDE
|
|
PATTERN "README.build" EXCLUDE
|
|
)
|
|
+ENDIF()
|
|
ENDIF()
|
|
|
|
# Now that we're done with all ADD_SUBDIRECTORY and thus all feature tests,
|