$NetBSD: patch-CMakeLists.txt,v 1.6 2014/11/29 10:01:29 adam Exp $ Split configuration between mysql-client and mysql-server. Build with newer DTrace. --- CMakeLists.txt.orig 2014-11-04 07:49:52.000000000 +0000 +++ CMakeLists.txt @@ -165,6 +165,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) @@ -375,7 +376,6 @@ ADD_SUBDIRECTORY(strings) ADD_SUBDIRECTORY(vio) ADD_SUBDIRECTORY(regex) ADD_SUBDIRECTORY(mysys) -ADD_SUBDIRECTORY(libmysql) IF(WITH_UNIT_TESTS) ENABLE_TESTING() @@ -387,9 +387,13 @@ IF(WITH_UNIT_TESTS) ENDIF() ADD_SUBDIRECTORY(extra) -IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(tests) +IF(WITHOUT_SERVER) + ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(client) + ADD_SUBDIRECTORY(scripts) + ADD_SUBDIRECTORY(man) + ADD_SUBDIRECTORY(tests) +ELSE() ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql/share) ADD_SUBDIRECTORY(libservices) @@ -402,11 +406,7 @@ IF(NOT WITHOUT_SERVER) ADD_SUBDIRECTORY(mysql-test) ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(support-files) - ADD_SUBDIRECTORY(scripts) ADD_SUBDIRECTORY(sql-bench) - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) ENDIF()