1 --- CMakeLists.txt.orig 2015-11-02 16:25:51 UTC
3 @@ -403,33 +403,11 @@ IF(WITH_UNIT_TESTS)
6 ADD_SUBDIRECTORY(extra)
7 -IF(NOT WITHOUT_SERVER)
8 - ADD_SUBDIRECTORY(tests)
9 - ADD_SUBDIRECTORY(client)
10 - ADD_SUBDIRECTORY(sql)
11 - ADD_SUBDIRECTORY(sql/share)
12 - ADD_SUBDIRECTORY(libservices)
13 - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
14 - IF(WITH_EMBEDDED_SERVER)
15 - ADD_SUBDIRECTORY(libmysqld)
16 - ADD_SUBDIRECTORY(libmysqld/examples)
17 - ENDIF(WITH_EMBEDDED_SERVER)
19 - ADD_SUBDIRECTORY(mysql-test)
20 - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
21 - ADD_SUBDIRECTORY(support-files)
22 - ADD_SUBDIRECTORY(scripts)
23 - ADD_SUBDIRECTORY(sql-bench)
25 - ADD_SUBDIRECTORY(man)
27 - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
28 - ADD_SUBDIRECTORY(internal)
30 - ADD_SUBDIRECTORY(packaging/rpm-oel)
31 - ADD_SUBDIRECTORY(packaging/rpm-sles)
32 - ADD_SUBDIRECTORY(packaging/rpm-docker)
34 +ADD_SUBDIRECTORY(client)
35 +ADD_SUBDIRECTORY(libservices)
36 +ADD_SUBDIRECTORY(support-files)
37 +ADD_SUBDIRECTORY(scripts)
38 +ADD_SUBDIRECTORY(man)
40 INCLUDE(cmake/abi_check.cmake)
41 INCLUDE(cmake/tags.cmake)
42 @@ -466,19 +444,21 @@ IF(WIN32)
44 SET(CPACK_GENERATOR "TGZ")
47 ADD_SUBDIRECTORY(packaging/WiX)
48 ADD_SUBDIRECTORY(packaging/solaris)
51 # Create a single package with "make package"
52 # (see http://public.kitware.com/Bug/view.php?id=11452)
53 SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "")
56 - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info)
59 # RPM installs documentation directly from the source tree
62 IF(NOT INSTALL_LAYOUT MATCHES "RPM")
63 INSTALL(FILES COPYING LICENSE.mysql
64 DESTINATION ${INSTALL_DOCREADMEDIR}
65 @@ -504,6 +484,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
66 PATTERN "sp-imp-spec.txt" EXCLUDE