diff options
Diffstat (limited to 'databases/mysql57-client/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mysql57-client/files/patch-CMakeLists.txt | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/databases/mysql57-client/files/patch-CMakeLists.txt b/databases/mysql57-client/files/patch-CMakeLists.txt index e8efec8c25a5..4e9091fae53e 100644 --- a/databases/mysql57-client/files/patch-CMakeLists.txt +++ b/databases/mysql57-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 -+++ CMakeLists.txt 2014-08-04 13:56:19.445692503 +0000 -@@ -492,8 +492,8 @@ +--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ CMakeLists.txt +@@ -569,8 +569,8 @@ ENDIF() ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -10,16 +10,12 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -560,18 +560,17 @@ +@@ -639,14 +639,13 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) -ADD_SUBDIRECTORY(packaging/solaris) - # Create a single package with "make package" - # (see http://public.kitware.com/Bug/view.php?id=11452) - SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") - IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() @@ -30,10 +26,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -597,5 +596,6 @@ +@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + |