diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2013-12-19 20:02:37 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2013-12-19 20:02:37 +0000 |
| commit | d70827a7b05de8faeeaef5bbf43cbe29107537df (patch) | |
| tree | 1ad8a1dc2f64b280eebd2eaaa21fa4fdb3e32440 /databases/percona56-client | |
| parent | 6c878021aa7f3e1bfc3135e0d1d92f09734bd766 (diff) | |
| download | ports-d70827a7b05de8faeeaef5bbf43cbe29107537df.tar.gz ports-d70827a7b05de8faeeaef5bbf43cbe29107537df.zip | |
Notes
Diffstat (limited to 'databases/percona56-client')
| -rw-r--r-- | databases/percona56-client/files/patch-CMakeLists.txt | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/databases/percona56-client/files/patch-CMakeLists.txt b/databases/percona56-client/files/patch-CMakeLists.txt index 5815cc145d67..57b5c9c44684 100644 --- a/databases/percona56-client/files/patch-CMakeLists.txt +++ b/databases/percona56-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 -+++ CMakeLists.txt 2013-02-13 14:18:37.000000000 +0100 -@@ -378,31 +378,11 @@ +--- CMakeLists.txt.orig 2013-11-17 18:02:53.000000000 +0000 ++++ CMakeLists.txt 2013-12-16 14:43:48.037159232 +0000 +@@ -458,33 +458,11 @@ ENDIF() ADD_SUBDIRECTORY(extra) @@ -28,6 +28,8 @@ - ADD_SUBDIRECTORY(internal) - ENDIF() - ADD_SUBDIRECTORY(packaging/rpm-uln) +- ADD_SUBDIRECTORY(packaging/rpm-oel) +- ADD_SUBDIRECTORY(packaging/rpm-fedora) -ENDIF() +ADD_SUBDIRECTORY(client) +ADD_SUBDIRECTORY(libservices) @@ -37,7 +39,7 @@ INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -439,7 +419,6 @@ +@@ -521,18 +499,17 @@ SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -45,9 +47,8 @@ # Create a single package with "make package" # (see http://public.kitware.com/Bug/view.php?id=11452) -@@ -447,11 +426,11 @@ + SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") - INCLUDE(CPack) IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() @@ -58,8 +59,10 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -477,3 +456,4 @@ +@@ -558,5 +535,6 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() + + INCLUDE(CPack) |