54 lines
1.4 KiB
Plaintext
54 lines
1.4 KiB
Plaintext
$NetBSD: patch-CMakeLists.txt,v 1.4 2014/08/10 15:11:57 adam Exp $
|
|
|
|
Split configuration between mysql-client and mysql-server.
|
|
Build with newer DTrace.
|
|
|
|
--- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000
|
|
+++ CMakeLists.txt
|
|
@@ -215,6 +215,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)
|
|
@@ -472,7 +473,6 @@ ADD_SUBDIRECTORY(vio)
|
|
ADD_SUBDIRECTORY(regex)
|
|
ADD_SUBDIRECTORY(mysys)
|
|
ADD_SUBDIRECTORY(mysys_ssl)
|
|
-ADD_SUBDIRECTORY(libmysql)
|
|
|
|
IF(WITH_UNIT_TESTS)
|
|
ADD_SUBDIRECTORY(unittest)
|
|
@@ -491,16 +491,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)
|
|
@@ -511,7 +511,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)
|