diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2013-06-12 07:56:24 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2013-06-12 07:56:24 +0000 |
| commit | 424d74766cd4396c6c586247b841f1a17fb49114 (patch) | |
| tree | 18875f530cf6cdcf3334bd9803bbca104db941e6 /databases/mysql55-client/files | |
| parent | - Fix build (diff) | |
Update to 5.5.32 release.
Diffstat (limited to 'databases/mysql55-client/files')
| -rw-r--r-- | databases/mysql55-client/files/patch-CMakeLists.txt | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/databases/mysql55-client/files/patch-CMakeLists.txt b/databases/mysql55-client/files/patch-CMakeLists.txt index 3ecaa063edb0..2fab8152273e 100644 --- a/databases/mysql55-client/files/patch-CMakeLists.txt +++ b/databases/mysql55-client/files/patch-CMakeLists.txt @@ -1,5 +1,5 @@ ---- CMakeLists.txt.orig 2012-12-10 07:16:24.000000000 +0100 -+++ CMakeLists.txt 2012-12-21 22:33:41.000000000 +0100 +--- CMakeLists.txt.orig 2013-05-16 17:47:15.000000000 +0200 ++++ CMakeLists.txt 2013-06-12 09:22:45.000000000 +0200 @@ -305,31 +305,11 @@ ENDIF() @@ -37,7 +37,18 @@ INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -373,11 +353,11 @@ +@@ -365,8 +345,10 @@ + ELSE() + SET(CPACK_GENERATOR "TGZ") + ENDIF() ++IF(FALSE) + ADD_SUBDIRECTORY(packaging/WiX) + ADD_SUBDIRECTORY(packaging/solaris) ++ENDIF() + + # Create a single package with "make package" + # (see http://public.kitware.com/Bug/view.php?id=11452) +@@ -374,11 +356,11 @@ INCLUDE(CPack) IF(UNIX) @@ -50,7 +61,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -403,3 +383,4 @@ +@@ -404,3 +386,4 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() |