b67d2e76a5
ChangeLog for this update: https://dev.mysql.com/doc/relnotes/mysql/5.7/en/news-5-7-19.html PR: 220849 Reviewed by: mat (mentor) Approved by: mat (mentor) Sponsored by: Netzkommune GmbH Differential Revision: https://reviews.freebsd.org/D11656
46 lines
1.2 KiB
Text
46 lines
1.2 KiB
Text
--- CMakeLists.txt.orig 2017-06-22 14:13:19 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -610,9 +610,6 @@ IF(NOT WITHOUT_SERVER)
|
|
SET (MYSQLD_STATIC_EMBEDDED_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(include)
|
|
@@ -647,8 +644,8 @@ ENDIF()
|
|
|
|
ADD_SUBDIRECTORY(extra)
|
|
ADD_SUBDIRECTORY(client)
|
|
-ADD_SUBDIRECTORY(sql/share)
|
|
ADD_SUBDIRECTORY(libservices)
|
|
+ADD_SUBDIRECTORY(support-files)
|
|
|
|
IF(UNIX)
|
|
ADD_SUBDIRECTORY(man)
|
|
@@ -719,14 +716,13 @@ ELSE()
|
|
SET(CPACK_GENERATOR "TGZ")
|
|
ENDIF()
|
|
ADD_SUBDIRECTORY(packaging/WiX)
|
|
-ADD_SUBDIRECTORY(packaging/solaris)
|
|
|
|
IF(UNIX)
|
|
- INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
|
|
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}
|
|
@@ -749,6 +745,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
PATTERN "sp-imp-spec.txt" EXCLUDE
|
|
)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
INCLUDE(CPack)
|
|
|