|
Lines 1-20
Link Here
|
| 1 |
--- client/CMakeLists.txt.orig 2014-03-15 18:08:38.000000000 +0100 |
1 |
--- client/CMakeLists.txt 2018-02-01 14:51:01.000000000 +0100 |
| 2 |
+++ client/CMakeLists.txt 2014-03-22 19:41:40.272474641 +0100 |
2 |
+++ client/CMakeLists.txt.new 2018-02-20 15:53:56.534072000 +0100 |
| 3 |
@@ -37,9 +37,11 @@ |
3 |
@@ -37,10 +37,12 @@ |
| 4 |
TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) |
4 |
TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY}) |
| 5 |
ENDIF(UNIX) |
5 |
ENDIF(UNIX) |
| 6 |
|
6 |
|
| 7 |
+IF(FALSE) |
7 |
+IF(FALSE) |
| 8 |
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) |
8 |
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) |
| 9 |
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") |
9 |
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") |
| 10 |
TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) |
10 |
TARGET_LINK_LIBRARIES(mysqltest perconaserverclient regex) |
|
|
11 |
ADD_DEPENDENCIES(mysqltest GenError) |
| 11 |
+ENDIF() |
12 |
+ENDIF() |
| 12 |
|
13 |
|
| 13 |
|
|
|
| 14 |
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) |
14 |
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) |
| 15 |
@@ -51,15 +53,19 @@ |
15 |
TARGET_LINK_LIBRARIES(mysqlcheck perconaserverclient) |
| 16 |
MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) |
16 |
@@ -52,15 +54,19 @@ |
| 17 |
TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) |
17 |
TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) |
|
|
18 |
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") |
| 18 |
|
19 |
|
| 19 |
+IF(FALSE) |
20 |
+IF(FALSE) |
| 20 |
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) |
21 |
MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) |
|
Lines 32-38
Link Here
|
| 32 |
|
33 |
|
| 33 |
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc |
34 |
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc |
| 34 |
../sql/rpl_filter.cc ../sql/sql_list.cc) |
35 |
../sql/rpl_filter.cc ../sql/sql_list.cc) |
| 35 |
@@ -81,8 +87,6 @@ |
36 |
@@ -82,8 +88,6 @@ |
| 36 |
ENDIF(WIN32) |
37 |
ENDIF(WIN32) |
| 37 |
|
38 |
|
| 38 |
SET_TARGET_PROPERTIES ( |
39 |
SET_TARGET_PROPERTIES ( |