Changeset View
Changeset View
Standalone View
Standalone View
databases/mariadb100-server/files/patch-client_CMakeLists.txt
| --- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 | --- client/CMakeLists.txt.orig 2014-08-09 00:13:48.000000000 +0200 | ||||
| +++ client/CMakeLists.txt 2014-09-07 21:19:33.000000000 +0200 | +++ client/CMakeLists.txt 2014-09-07 21:19:33.000000000 +0200 | ||||
| @@ -30,6 +30,7 @@ | @@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES( | ||||
| COPY_OPENSSL_DLLS(copy_openssl_client) | COPY_OPENSSL_DLLS(copy_openssl_client) | ||||
| ADD_DEFINITIONS(${SSL_DEFINES}) | ADD_DEFINITIONS(${SSL_DEFINES}) | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc | MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc | ||||
| ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) | ${CMAKE_SOURCE_DIR}/sql/sql_string.cc) | ||||
| TARGET_LINK_LIBRARIES(mysql mysqlclient) | TARGET_LINK_LIBRARIES(mysql mysqlclient) | ||||
| @@ -37,6 +38,7 @@ | @@ -37,6 +38,7 @@ IF(UNIX) | ||||
| TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) | TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) | ||||
| SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) | SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) | ||||
| ENDIF(UNIX) | ENDIF(UNIX) | ||||
| +ENDIF() | +ENDIF() | ||||
| MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) | MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) | ||||
| SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") | SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||||
| @@ -44,6 +46,7 @@ | @@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli | ||||
| SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) | SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) | MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) | ||||
| TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) | TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) | ||||
| @@ -52,17 +55,21 @@ | @@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli | ||||
| MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) | MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) | ||||
| TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) | TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) | ||||
| +ENDIF() | +ENDIF() | ||||
| MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) | MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) | ||||
| TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) | TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) | ||||
| ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) | ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) | MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) | ||||
| TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) | TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) | ||||
| +ENDIF() | +ENDIF() | ||||
| MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) | MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) | ||||
| TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) | TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) | ||||
| +IF(FALSE) | +IF(FALSE) | ||||
| MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) | MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) | ||||
| TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) | TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) | ||||
| @@ -72,17 +79,20 @@ | @@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl | ||||
| MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) | MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) | ||||
| SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") | SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") | ||||
| TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) | TARGET_LINK_LIBRARIES(mysqlslap mysqlclient) | ||||
| +ENDIF() | +ENDIF() | ||||
| # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". | # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". | ||||
| IF(WIN32) | IF(WIN32) | ||||
| MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) | MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) | ||||
| Show All 13 Lines | |||||