ports/databases/percona56-client/files/patch-CMakeLists.txt
Florian Smeets 2c69d5125f Update to 5.6.36-82.0
PR:		219631
Submitted by:	Thomas Babut
2017-08-01 19:14:54 +00:00

74 lines
2 KiB
Text

--- CMakeLists.txt.orig 2017-05-29 12:44:32.006353000 +0200
+++ CMakeLists.txt 2017-05-29 12:46:55.502845000 +0200
@@ -486,42 +486,17 @@
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(sql/share)
ADD_SUBDIRECTORY(libservices)
+ADD_SUBDIRECTORY(support-files)
IF(UNIX)
ADD_SUBDIRECTORY(man)
ENDIF()
-IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(tests)
- ADD_SUBDIRECTORY(sql)
- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
- IF(WITH_EMBEDDED_SERVER)
- ADD_SUBDIRECTORY(libmysqld)
- ADD_SUBDIRECTORY(libmysqld/examples)
- ENDIF(WITH_EMBEDDED_SERVER)
-ENDIF()
-
# scripts/mysql_config depends on client and server targets loaded above.
# It is referenced by some of the directories below, so we insert it here.
ADD_SUBDIRECTORY(scripts)
-IF(NOT WITHOUT_SERVER)
- ADD_SUBDIRECTORY(mysql-test)
- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
- ADD_SUBDIRECTORY(support-files)
- ADD_SUBDIRECTORY(sql-bench)
- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
- ADD_SUBDIRECTORY(internal)
- ENDIF()
- ADD_SUBDIRECTORY(packaging/rpm-oel)
- ADD_SUBDIRECTORY(packaging/rpm-fedora)
- ADD_SUBDIRECTORY(packaging/rpm-sles)
- ADD_SUBDIRECTORY(packaging/rpm-docker)
- ADD_SUBDIRECTORY(packaging/deb-in)
-ENDIF()
-
INCLUDE(cmake/abi_check.cmake)
INCLUDE(cmake/tags.cmake)
@@ -558,18 +533,17 @@
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}
@@ -591,6 +565,7 @@
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
INCLUDE(CPack)