diff options
Diffstat (limited to 'databases/mysql80-client/files/patch-CMakeLists.txt')
| -rw-r--r-- | databases/mysql80-client/files/patch-CMakeLists.txt | 40 |
1 files changed, 18 insertions, 22 deletions
diff --git a/databases/mysql80-client/files/patch-CMakeLists.txt b/databases/mysql80-client/files/patch-CMakeLists.txt index 8899cffb27ea..7481d9053a23 100644 --- a/databases/mysql80-client/files/patch-CMakeLists.txt +++ b/databases/mysql80-client/files/patch-CMakeLists.txt @@ -1,6 +1,12 @@ ---- CMakeLists.txt.orig 2017-06-27 11:44:29 UTC +--- CMakeLists.txt.orig 2018-05-03 10:27:45 UTC +++ CMakeLists.txt -@@ -700,9 +700,6 @@ IF(NOT WITHOUT_SERVER) +@@ -835,14 +835,12 @@ ADD_SUBDIRECTORY(extra/regex) + ADD_SUBDIRECTORY(libmysql) + ADD_SUBDIRECTORY(libbinlogevents) + ADD_SUBDIRECTORY(libbinlogstandalone) ++ADD_SUBDIRECTORY(support-files) + + IF(NOT WITHOUT_SERVER) SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "") # Add storage engines and plugins. CONFIGURE_PLUGINS() @@ -9,36 +15,26 @@ - ADD_SUBDIRECTORY(storage/ndb) ENDIF() - 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(NOT WITHOUT_SERVER) - SET (MYSQLD_STATIC_COMPONENT_LIBS "" CACHE INTERNAL "") -@@ -811,14 +809,13 @@ ELSE() - SET(CPACK_GENERATOR "TGZ") - ENDIF() +@@ -966,12 +964,10 @@ ENDIF() ADD_SUBDIRECTORY(packaging/WiX) --ADD_SUBDIRECTORY(packaging/solaris) + ADD_SUBDIRECTORY(packaging/solaris) - IF(UNIX) +-IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) - ENDIF() +-ENDIF() # # RPM installs documentation directly from the source tree # +IF(FALSE) IF(NOT INSTALL_LAYOUT MATCHES "RPM") - INSTALL(FILES COPYING LICENSE.mysql - DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -841,6 +838,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") - PATTERN "sp-imp-spec.txt" EXCLUDE + INSTALL(FILES README LICENSE DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme) + INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR}) +@@ -990,6 +986,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") + PATTERN "README.build" EXCLUDE ) ENDIF() +ENDIF() - INCLUDE(CPack) - + IF(UNIX) + EXECUTE_PROCESS( |