$NetBSD: patch-CMakeLists.txt,v 1.7 2020/07/07 20:18:20 adam Exp $ Split configuration between mysql-client and mysql-server. Build with newer DTrace. --- CMakeLists.txt.orig 2016-07-11 09:19:51.000000000 +0000 +++ CMakeLists.txt @@ -202,6 +202,7 @@ IF(DISABLE_SHARED) SET(WITHOUT_DYNAMIC_PLUGINS 1) ENDIF() OPTION(ENABLED_PROFILING "Enable profiling" ON) +OPTION(ENABLE_DTRACE "Include support for DTrace probes" OFF) OPTION(CYBOZU "" OFF) OPTION(BACKUP_TEST "" OFF) OPTION(WITHOUT_SERVER OFF) @@ -495,7 +496,6 @@ ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(regex) ADD_SUBDIRECTORY(mysys) ADD_SUBDIRECTORY(mysys_ssl) -ADD_SUBDIRECTORY(libmysql) IF(WITH_UNIT_TESTS) # Visual Studio 11 needs this extra flag in order to compile gmock. @@ -513,16 +513,16 @@ IF(WITH_UNIT_TESTS) ENDIF() ADD_SUBDIRECTORY(extra) -ADD_SUBDIRECTORY(client) ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(libservices) -IF(UNIX) +IF(WITHOUT_SERVER) + ADD_SUBDIRECTORY(libmysql) + ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(man) -ENDIF() - -IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(tests) +ELSE() ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) @@ -533,7 +533,6 @@ 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) IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(mysql-test)