|
Lines 1-6
Link Here
|
| 1 |
--- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200 |
1 |
--- CMakeLists.txt 2015-09-14 17:49:16.000000000 +0200 |
| 2 |
+++ CMakeLists.txt 2014-10-18 16:20:43.311977761 +0200 |
2 |
+++ CMakeLists.txt.new 2015-09-16 09:04:18.149047561 +0200 |
| 3 |
@@ -468,40 +468,17 @@ |
3 |
@@ -471,41 +471,17 @@ |
| 4 |
|
4 |
|
| 5 |
ADD_SUBDIRECTORY(extra) |
5 |
ADD_SUBDIRECTORY(extra) |
| 6 |
ADD_SUBDIRECTORY(client) |
6 |
ADD_SUBDIRECTORY(client) |
|
Lines 37-48
Link Here
|
| 37 |
- ADD_SUBDIRECTORY(packaging/rpm-oel) |
37 |
- ADD_SUBDIRECTORY(packaging/rpm-oel) |
| 38 |
- ADD_SUBDIRECTORY(packaging/rpm-fedora) |
38 |
- ADD_SUBDIRECTORY(packaging/rpm-fedora) |
| 39 |
- ADD_SUBDIRECTORY(packaging/rpm-sles) |
39 |
- ADD_SUBDIRECTORY(packaging/rpm-sles) |
|
|
40 |
- ADD_SUBDIRECTORY(packaging/rpm-docker) |
| 40 |
-ENDIF() |
41 |
-ENDIF() |
| 41 |
- |
42 |
- |
| 42 |
INCLUDE(cmake/abi_check.cmake) |
43 |
INCLUDE(cmake/abi_check.cmake) |
| 43 |
INCLUDE(cmake/tags.cmake) |
44 |
INCLUDE(cmake/tags.cmake) |
| 44 |
|
45 |
|
| 45 |
@@ -568,18 +546,17 @@ |
46 |
@@ -542,18 +518,17 @@ |
| 46 |
SET(CPACK_GENERATOR "TGZ") |
47 |
SET(CPACK_GENERATOR "TGZ") |
| 47 |
ENDIF() |
48 |
ENDIF() |
| 48 |
ADD_SUBDIRECTORY(packaging/WiX) |
49 |
ADD_SUBDIRECTORY(packaging/WiX) |
|
Lines 62-68
Link Here
|
| 62 |
IF(NOT INSTALL_LAYOUT MATCHES "RPM") |
63 |
IF(NOT INSTALL_LAYOUT MATCHES "RPM") |
| 63 |
INSTALL(FILES COPYING LICENSE.mysql |
64 |
INSTALL(FILES COPYING LICENSE.mysql |
| 64 |
DESTINATION ${INSTALL_DOCREADMEDIR} |
65 |
DESTINATION ${INSTALL_DOCREADMEDIR} |
| 65 |
@@ -605,5 +582,6 @@ |
66 |
@@ -579,6 +554,7 @@ |
| 66 |
PATTERN "sp-imp-spec.txt" EXCLUDE |
67 |
PATTERN "sp-imp-spec.txt" EXCLUDE |
| 67 |
) |
68 |
) |
| 68 |
ENDIF() |
69 |
ENDIF() |