diff options
Diffstat (limited to 'databases/mysql57-server/files/patch-client_CMakeLists.txt')
| -rw-r--r-- | databases/mysql57-server/files/patch-client_CMakeLists.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/databases/mysql57-server/files/patch-client_CMakeLists.txt b/databases/mysql57-server/files/patch-client_CMakeLists.txt index e8f06254e2ca..03549e41d244 100644 --- a/databases/mysql57-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-client_CMakeLists.txt @@ -1,6 +1,6 @@ ---- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC +--- client/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC +++ client/CMakeLists.txt -@@ -38,8 +38,6 @@ ADD_DEFINITIONS( +@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil ## Subdirectory with common client code. ADD_SUBDIRECTORY(base) @@ -9,8 +9,8 @@ ## We will need libeay32.dll and ssleay32.dll when running client executables. COPY_OPENSSL_DLLS(copy_openssl_client) -@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F - ENDIF() +@@ -41,11 +39,13 @@ COPY_OPENSSL_DLLS(copy_openssl_client) + INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake) ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) @@ -23,7 +23,7 @@ IF(NOT WITHOUT_SERVER) MYSQL_ADD_EXECUTABLE(mysql_upgrade -@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli +@@ -65,6 +65,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) @@ -31,7 +31,7 @@ MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) -@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc +@@ -77,10 +78,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) @@ -44,7 +44,7 @@ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) ADD_COMPILE_FLAGS( mysqlbinlog.cc -@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli +@@ -97,6 +100,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) @@ -52,7 +52,7 @@ MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) -@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) +@@ -112,9 +116,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) ENDIF() @@ -64,7 +64,7 @@ # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -197,11 +203,6 @@ ENDIF(WIN32) +@@ -123,11 +129,6 @@ ENDIF(WIN32) SET_TARGET_PROPERTIES ( mysql_plugin |