diff options
Diffstat (limited to 'databases/mysql80-client/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mysql80-client/files/patch-CMakeLists.txt | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/databases/mysql80-client/files/patch-CMakeLists.txt b/databases/mysql80-client/files/patch-CMakeLists.txt index 4d202eb72f10..8899cffb27ea 100644 --- a/databases/mysql80-client/files/patch-CMakeLists.txt +++ b/databases/mysql80-client/files/patch-CMakeLists.txt @@ -1,16 +1,24 @@ ---- CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +--- CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +++ CMakeLists.txt -@@ -606,8 +606,8 @@ ENDIF() +@@ -700,9 +700,6 @@ IF(NOT WITHOUT_SERVER) + SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") + # Add storage engines and plugins. + CONFIGURE_PLUGINS() +-ELSE() +- # We may still want Cluster client libraries, use -DWITH_NDBCLUSTER=1 +- ADD_SUBDIRECTORY(storage/ndb) + ENDIF() - ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(client) --ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(libservices) + ADD_SUBDIRECTORY(include) +@@ -715,6 +712,7 @@ ADD_SUBDIRECTORY(extra/regex) + ADD_SUBDIRECTORY(libmysql) + ADD_SUBDIRECTORY(libbinlogevents) + ADD_SUBDIRECTORY(libbinlogstandalone) +ADD_SUBDIRECTORY(support-files) - IF(UNIX) - ADD_SUBDIRECTORY(man) -@@ -676,14 +676,13 @@ ELSE() + IF(NOT WITHOUT_SERVER) + SET (MYSQLD_STATIC_COMPONENT_LIBS "" CACHE INTERNAL "") +@@ -811,14 +809,13 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -26,7 +34,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -706,6 +705,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") +@@ -841,6 +838,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() |