blob: 0ee4f37e358a8e9310cea458a732b27c35f0579f (
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
37
38
39
40
41
42
43
44
45
46
47
48
49
|
--- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200
+++ CMakeLists.txt 2014-10-18 18:37:40.964417855 +0200
@@ -508,12 +508,10 @@
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()
@@ -522,10 +520,7 @@
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()
@@ -568,7 +563,6 @@
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)
@@ -580,6 +574,7 @@
#
# RPM installs documentation directly from the source tree
#
+IF(FALSE)
IF(NOT INSTALL_LAYOUT MATCHES "RPM")
INSTALL(FILES COPYING LICENSE.mysql
DESTINATION ${INSTALL_DOCREADMEDIR}
@@ -605,5 +600,6 @@
PATTERN "sp-imp-spec.txt" EXCLUDE
)
ENDIF()
+ENDIF()
INCLUDE(CPack)
|
