blob: 4e9091fae53e1c066f1db1ebf21a0a44a988fa48 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC
+++ CMakeLists.txt
@@ -569,8 +569,8 @@ ENDIF()
ADD_SUBDIRECTORY(extra)
ADD_SUBDIRECTORY(client)
-ADD_SUBDIRECTORY(sql/share)
ADD_SUBDIRECTORY(libservices)
+ADD_SUBDIRECTORY(support-files)
IF(UNIX)
ADD_SUBDIRECTORY(man)
@@ -639,14 +639,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}
@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM")
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
INCLUDE(CPack)
|
