--- CMakeLists.txt.orig 2024-07-12 19:15:25 UTC +++ CMakeLists.txt @@ -1848,7 +1848,7 @@ IF(WITH_AUTHENTICATION_LDAP) 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 @@ -1897,6 +1897,7 @@ ENDIF() ENDIF() ENDIF() +IF(NOT WITHOUT_TOOLS) # Add system/bundled editline. MYSQL_CHECK_EDITLINE() SET(EDITLINE_WARN_GIVEN) @@ -1907,7 +1908,9 @@ ENDIF() "You can use -DWITH_EDITLINE=bundled instead." ) ENDIF() +ENDIF(NOT WITHOUT_TOOLS) +IF(NOT WITHOUT_SERVER) # Add libevent MYSQL_CHECK_LIBEVENT() UNSET(LIBEVENT_WARN_GIVEN) @@ -1918,6 +1921,7 @@ ENDIF() "You can use -DWITH_LIBEVENT=bundled instead." ) ENDIF() +ENDIF(NOT WITHOUT_SERVER) # Add lz4 library MYSQL_CHECK_LZ4() @@ -2180,7 +2184,9 @@ ADD_DEPENDENCIES(clang_tidy_prerequisites GenError) ADD_DEPENDENCIES(clang_tidy_prerequisites protobuf_generated_all) ADD_DEPENDENCIES(clang_tidy_prerequisites GenError) -ADD_SUBDIRECTORY(include) +IF(NOT WITHOUT_CLIENTLIBS) + ADD_SUBDIRECTORY(include) +ENDIF(NOT WITHOUT_CLIENTLIBS) ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(mysys) @@ -2230,12 +2236,15 @@ ENDIF() ADD_SUBDIRECTORY(unittest/mytap/t) ENDIF() -ADD_SUBDIRECTORY(client) +IF(NOT WITHOUT_TOOLS) + 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() @@ -2305,11 +2314,11 @@ ADD_SUBDIRECTORY(scripts) # 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() @@ -2336,7 +2345,7 @@ ENDIF() INCLUDE(fastcov) ENDIF() -IF(UNIX) +IF(FALSE) ADD_SUBDIRECTORY(man) ENDIF()