summaryrefslogtreecommitdiff
path: root/databases/mysql55-client/patches/patch-CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql55-client/patches/patch-CMakeLists.txt')
-rw-r--r--databases/mysql55-client/patches/patch-CMakeLists.txt14
1 files changed, 7 insertions, 7 deletions
diff --git a/databases/mysql55-client/patches/patch-CMakeLists.txt b/databases/mysql55-client/patches/patch-CMakeLists.txt
index 803dfe8cc74..b71ccb0f5d2 100644
--- a/databases/mysql55-client/patches/patch-CMakeLists.txt
+++ b/databases/mysql55-client/patches/patch-CMakeLists.txt
@@ -1,11 +1,11 @@
-$NetBSD: patch-CMakeLists.txt,v 1.5 2014/02/13 15:47:15 jperkin Exp $
+$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 2013-03-25 13:14:58.000000000 +0000
+--- CMakeLists.txt.orig 2014-11-04 07:49:52.000000000 +0000
+++ CMakeLists.txt
-@@ -168,6 +168,7 @@ IF(DISABLE_SHARED)
+@@ -165,6 +165,7 @@ IF(DISABLE_SHARED)
SET(WITHOUT_DYNAMIC_PLUGINS 1)
ENDIF()
OPTION(ENABLED_PROFILING "Enable profiling" ON)
@@ -13,15 +13,15 @@ Build with newer DTrace.
OPTION(CYBOZU "" OFF)
OPTION(BACKUP_TEST "" OFF)
OPTION(WITHOUT_SERVER OFF)
-@@ -293,7 +293,6 @@ ADD_SUBDIRECTORY(strings)
+@@ -375,7 +376,6 @@ ADD_SUBDIRECTORY(strings)
ADD_SUBDIRECTORY(vio)
ADD_SUBDIRECTORY(regex)
ADD_SUBDIRECTORY(mysys)
-ADD_SUBDIRECTORY(libmysql)
-
IF(WITH_UNIT_TESTS)
-@@ -305,9 +304,13 @@ IF(WITH_UNIT_TESTS)
+ ENABLE_TESTING()
+@@ -387,9 +387,13 @@ IF(WITH_UNIT_TESTS)
ENDIF()
ADD_SUBDIRECTORY(extra)
@@ -37,7 +37,7 @@ Build with newer DTrace.
ADD_SUBDIRECTORY(sql)
ADD_SUBDIRECTORY(sql/share)
ADD_SUBDIRECTORY(libservices)
-@@ -320,11 +323,7 @@ IF(NOT WITHOUT_SERVER)
+@@ -402,11 +406,7 @@ IF(NOT WITHOUT_SERVER)
ADD_SUBDIRECTORY(mysql-test)
ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
ADD_SUBDIRECTORY(support-files)