Changeset View
Changeset View
Standalone View
Standalone View
databases/mysqlwsrep56-server/files/patch-CMakeLists.txt
--- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 | --- CMakeLists.txt.orig 2017-01-25 07:58:07 UTC | ||||
+++ CMakeLists.txt 2014-08-04 14:18:38.795491147 +0000 | +++ CMakeLists.txt | ||||
@@ -500,12 +500,10 @@ | @@ -499,12 +499,10 @@ IF(UNIX) | ||||
ENDIF() | ENDIF() | ||||
IF(NOT WITHOUT_SERVER) | IF(NOT WITHOUT_SERVER) | ||||
- ADD_SUBDIRECTORY(tests) | - ADD_SUBDIRECTORY(tests) | ||||
ADD_SUBDIRECTORY(sql) | ADD_SUBDIRECTORY(sql) | ||||
OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) | OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) | ||||
IF(WITH_EMBEDDED_SERVER) | IF(WITH_EMBEDDED_SERVER) | ||||
ADD_SUBDIRECTORY(libmysqld) | ADD_SUBDIRECTORY(libmysqld) | ||||
- ADD_SUBDIRECTORY(libmysqld/examples) | - ADD_SUBDIRECTORY(libmysqld/examples) | ||||
ENDIF(WITH_EMBEDDED_SERVER) | ENDIF(WITH_EMBEDDED_SERVER) | ||||
ENDIF() | ENDIF() | ||||
@@ -514,10 +512,7 @@ | @@ -513,10 +511,7 @@ ENDIF() | ||||
ADD_SUBDIRECTORY(scripts) | ADD_SUBDIRECTORY(scripts) | ||||
IF(NOT WITHOUT_SERVER) | IF(NOT WITHOUT_SERVER) | ||||
- ADD_SUBDIRECTORY(mysql-test) | - ADD_SUBDIRECTORY(mysql-test) | ||||
- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) | - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) | ||||
ADD_SUBDIRECTORY(support-files) | ADD_SUBDIRECTORY(support-files) | ||||
- ADD_SUBDIRECTORY(sql-bench) | - ADD_SUBDIRECTORY(sql-bench) | ||||
IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) | IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) | ||||
ADD_SUBDIRECTORY(internal) | ADD_SUBDIRECTORY(internal) | ||||
ENDIF() | ENDIF() | ||||
@@ -572,6 +567,7 @@ | @@ -574,6 +569,7 @@ ENDIF() | ||||
# | # | ||||
# RPM installs documentation directly from the source tree | # RPM installs documentation directly from the source tree | ||||
# | # | ||||
+IF(FALSE) | +IF(FALSE) | ||||
IF(NOT INSTALL_LAYOUT MATCHES "RPM") | IF(NOT INSTALL_LAYOUT MATCHES "RPM") | ||||
INSTALL(FILES COPYING LICENSE.mysql | INSTALL(FILES COPYING LICENSE.mysql | ||||
DESTINATION ${INSTALL_DOCREADMEDIR} | DESTINATION ${INSTALL_DOCREADMEDIR} | ||||
@@ -597,5 +593,6 @@ | @@ -597,6 +593,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") | ||||
PATTERN "sp-imp-spec.txt" EXCLUDE | PATTERN "sp-imp-spec.txt" EXCLUDE | ||||
) | ) | ||||
ENDIF() | ENDIF() | ||||
+ENDIF() | +ENDIF() | ||||
INCLUDE(CPack) | INCLUDE(CPack) | ||||