7164158100
- Port improvements from MySQL 5.7 port - Use system libs instead of bundled - Fix many open PRs - Change MAINTAINER PR: 216244 192657 198812 199751 205093 PR: 209618 211248 205983 209338
40 lines
1,018 B
Text
40 lines
1,018 B
Text
--- CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
|
|
+++ CMakeLists.txt
|
|
@@ -481,8 +481,8 @@ ENDIF()
|
|
|
|
ADD_SUBDIRECTORY(extra)
|
|
ADD_SUBDIRECTORY(client)
|
|
-ADD_SUBDIRECTORY(sql/share)
|
|
ADD_SUBDIRECTORY(libservices)
|
|
+ADD_SUBDIRECTORY(support-files)
|
|
|
|
IF(UNIX)
|
|
ADD_SUBDIRECTORY(man)
|
|
@@ -552,18 +552,17 @@ 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()
|
|
#
|
|
# RPM installs documentation directly from the source tree
|
|
#
|
|
+IF(FALSE)
|
|
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
INSTALL(FILES COPYING LICENSE.mysql
|
|
DESTINATION ${INSTALL_DOCREADMEDIR}
|
|
@@ -585,6 +584,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
|
|
PATTERN "sp-imp-spec.txt" EXCLUDE
|
|
)
|
|
ENDIF()
|
|
+ENDIF()
|
|
|
|
INCLUDE(CPack)
|
|
|