|
Lines 1-5
Link Here
|
| 1 |
--- client/CMakeLists.txt.orig 2015-05-06 12:38:47.000000000 +0200 |
1 |
--- client/CMakeLists.txt 2015-11-03 12:14:08.000000000 +0100 |
| 2 |
+++ client/CMakeLists.txt 2015-06-07 18:30:20.496432000 +0200 |
2 |
+++ client/CMakeLists.txt.new 2015-11-06 10:28:27.753882068 +0100 |
| 3 |
@@ -31,17 +31,20 @@ |
3 |
@@ -31,17 +31,20 @@ |
| 4 |
COPY_OPENSSL_DLLS(copy_openssl_client) |
4 |
COPY_OPENSSL_DLLS(copy_openssl_client) |
| 5 |
|
5 |
|
|
Lines 21-30
Link Here
|
| 21 |
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) |
21 |
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) |
| 22 |
TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) |
22 |
TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) |
| 23 |
|
23 |
|
| 24 |
@@ -50,17 +53,21 @@ |
24 |
@@ -51,17 +54,21 @@ |
| 25 |
|
|
|
| 26 |
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) |
25 |
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) |
| 27 |
TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) |
26 |
TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) |
|
|
27 |
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") |
| 28 |
+ENDIF() |
28 |
+ENDIF() |
| 29 |
|
29 |
|
| 30 |
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) |
30 |
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) |
|
Lines 43-49
Link Here
|
| 43 |
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc |
43 |
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc |
| 44 |
../sql/rpl_filter.cc ../sql/sql_list.cc) |
44 |
../sql/rpl_filter.cc ../sql/sql_list.cc) |
| 45 |
TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient) |
45 |
TARGET_LINK_LIBRARIES(mysqlbinlog perconaserverclient) |
| 46 |
@@ -74,6 +81,7 @@ |
46 |
@@ -75,6 +82,7 @@ |
| 47 |
|
47 |
|
| 48 |
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) |
48 |
MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) |
| 49 |
TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient) |
49 |
TARGET_LINK_LIBRARIES(mysql_config_editor perconaserverclient) |
|
Lines 51-57
Link Here
|
| 51 |
|
51 |
|
| 52 |
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". |
52 |
# "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". |
| 53 |
IF(WIN32) |
53 |
IF(WIN32) |
| 54 |
@@ -83,11 +91,6 @@ |
54 |
@@ -84,11 +92,6 @@ |
| 55 |
SET_TARGET_PROPERTIES ( |
55 |
SET_TARGET_PROPERTIES ( |
| 56 |
mysql_plugin |
56 |
mysql_plugin |
| 57 |
mysql_upgrade |
57 |
mysql_upgrade |