Lines 1-20
Link Here
|
1 |
--- client/CMakeLists.txt.orig 2015-12-23 15:33:29 UTC |
1 |
--- client/CMakeLists.txt.orig 2019-02-07 13:34:20 UTC |
2 |
+++ client/CMakeLists.txt |
2 |
+++ client/CMakeLists.txt |
3 |
@@ -38,11 +38,12 @@ IF(UNIX) |
3 |
@@ -39,11 +39,12 @@ IF(UNIX) |
4 |
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) |
4 |
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) |
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 mysqlclient pcre pcreposix) |
10 |
TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix pcre) |
11 |
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) |
11 |
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) |
12 |
- |
12 |
- |
13 |
+ENDIF() |
13 |
+ENDIF() |
14 |
|
14 |
|
15 |
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) |
15 |
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) |
16 |
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) |
16 |
TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) |
17 |
@@ -54,21 +55,25 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim |
17 |
@@ -55,15 +56,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) |
18 |
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") |
18 |
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") |
19 |
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) |
19 |
TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) |
20 |
|
20 |
|
Lines 34-47
Link Here
|
34 |
|
34 |
|
35 |
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) |
35 |
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) |
36 |
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) |
36 |
TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) |
37 |
|
37 |
@@ -81,10 +86,12 @@ IF(WIN32) |
38 |
MYSQL_ADD_EXECUTABLE(mysqladmin mysqladmin.cc) |
|
|
39 |
-TARGET_LINK_LIBRARIES(mysqladmin mysqlclient) |
40 |
+tARGET_LINK_LIBRARIES(mysqladmin mysqlclient) |
41 |
|
42 |
MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c) |
43 |
SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS") |
44 |
@@ -80,10 +85,12 @@ IF(WIN32) |
45 |
ENDIF(WIN32) |
38 |
ENDIF(WIN32) |
46 |
|
39 |
|
47 |
# async_example is just a code example, do not install it. |
40 |
# async_example is just a code example, do not install it. |