Changeset View
Changeset View
Standalone View
Standalone View
head/databases/mariadb100-client/files/patch-CMakeLists.txt
| --- CMakeLists.txt.orig 2014-09-25 00:29:47.000000000 +0200 | --- CMakeLists.txt.orig 2015-08-05 20:11:27.000000000 +0200 | ||||
| +++ CMakeLists.txt 2014-09-27 09:57:32.000000000 +0200 | +++ CMakeLists.txt 2015-08-07 12:05:52.895578945 +0200 | ||||
| @@ -430,28 +430,8 @@ | @@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client) | ||||
| ADD_SUBDIRECTORY(extra) | ADD_SUBDIRECTORY(extra) | ||||
| ADD_SUBDIRECTORY(libservices) | ADD_SUBDIRECTORY(libservices) | ||||
| ADD_SUBDIRECTORY(scripts) | ADD_SUBDIRECTORY(scripts) | ||||
| -ADD_SUBDIRECTORY(sql/share) | -ADD_SUBDIRECTORY(sql/share) | ||||
| ADD_SUBDIRECTORY(support-files) | ADD_SUBDIRECTORY(support-files) | ||||
| -IF(NOT WITHOUT_SERVER) | +IF(FALSE) | ||||
| - ADD_SUBDIRECTORY(tests) | IF(NOT WITHOUT_SERVER) | ||||
| - ADD_SUBDIRECTORY(sql) | ADD_SUBDIRECTORY(tests) | ||||
| - OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) | ADD_SUBDIRECTORY(sql) | ||||
| - IF(WITH_EMBEDDED_SERVER) | @@ -425,6 +426,7 @@ IF(NOT WITHOUT_SERVER) | ||||
| - ADD_SUBDIRECTORY(libmysqld) | ADD_SUBDIRECTORY(internal) | ||||
| - ADD_SUBDIRECTORY(libmysqld/examples) | |||||
| - ENDIF(WITH_EMBEDDED_SERVER) | |||||
| - | |||||
| - ADD_SUBDIRECTORY(mysql-test) | |||||
| - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) | |||||
| - ADD_SUBDIRECTORY(sql-bench) | |||||
| - | |||||
| - IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) | |||||
| - ADD_SUBDIRECTORY(internal) | |||||
| - ENDIF() | |||||
| - ADD_SUBDIRECTORY(packaging/rpm-oel) | |||||
| -ENDIF() | |||||
| - | |||||
| IF(UNIX) | |||||
| ADD_SUBDIRECTORY(man) | |||||
| ENDIF() | ENDIF() | ||||
| @@ -463,7 +443,6 @@ | |||||
| ADD_SUBDIRECTORY(win/upgrade_wizard) | |||||
| ADD_SUBDIRECTORY(win/packaging) | |||||
| ENDIF() | ENDIF() | ||||
| -ADD_SUBDIRECTORY(packaging/solaris) | +ENDIF() | ||||
| IF(NOT CMAKE_CROSSCOMPILING) | IF(UNIX) | ||||
| SET(EXPORTED comp_err comp_sql factorial) | ADD_SUBDIRECTORY(man) | ||||
| @@ -506,6 +485,7 @@ | @@ -480,6 +482,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL | ||||
| WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | WORKING_DIRECTORY ${CMAKE_BINARY_DIR} | ||||
| ) | ) | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT | INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT | ||||
| COMPONENT Readme) | COMPONENT Readme) | ||||
| @@ -516,6 +496,7 @@ | @@ -490,6 +493,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP | ||||
| IF(UNIX) | IF(UNIX) | ||||
| INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) | INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) | ||||
| ENDIF() | ENDIF() | ||||
| +ENDIF() | +ENDIF() | ||||
| INCLUDE(CPack) | INCLUDE(CPack) | ||||