|
Lines 1-6
Link Here
|
| 1 |
--- client/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC |
1 |
--- client/CMakeLists.txt.orig 2019-02-20 07:59:09 UTC |
| 2 |
+++ client/CMakeLists.txt |
2 |
+++ client/CMakeLists.txt |
| 3 |
@@ -35,6 +35,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) |
3 |
@@ -36,6 +36,8 @@ COPY_OPENSSL_DLLS(copy_openssl_client) |
| 4 |
SET(CLIENT_LIB mariadbclient mysys) |
4 |
SET(CLIENT_LIB mariadbclient mysys) |
| 5 |
|
5 |
|
| 6 |
ADD_DEFINITIONS(${SSL_DEFINES}) |
6 |
ADD_DEFINITIONS(${SSL_DEFINES}) |
|
Lines 9-27
Link Here
|
| 9 |
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc |
9 |
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc |
| 10 |
${CMAKE_SOURCE_DIR}/sql/sql_string.cc) |
10 |
${CMAKE_SOURCE_DIR}/sql/sql_string.cc) |
| 11 |
TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB}) |
11 |
TARGET_LINK_LIBRARIES(mysql ${CLIENT_LIB}) |
| 12 |
@@ -43,11 +45,6 @@ IF(UNIX) |
12 |
@@ -44,11 +46,6 @@ IF(UNIX) |
| 13 |
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) |
13 |
SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) |
| 14 |
ENDIF(UNIX) |
14 |
ENDIF(UNIX) |
| 15 |
|
15 |
|
| 16 |
-MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) |
16 |
-MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) |
| 17 |
-SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") |
17 |
-SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") |
| 18 |
-TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcre pcreposix) |
18 |
-TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcreposix pcre) |
| 19 |
-SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) |
19 |
-SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) |
| 20 |
- |
20 |
- |
| 21 |
|
21 |
|
| 22 |
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) |
22 |
MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) |
| 23 |
TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) |
23 |
TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) |
| 24 |
@@ -60,16 +57,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim |
24 |
@@ -61,16 +58,6 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlim |
| 25 |
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") |
25 |
SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") |
| 26 |
TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB}) |
26 |
TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB}) |
| 27 |
|
27 |
|
|
Lines 38-44
Link Here
|
| 38 |
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) |
38 |
MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) |
| 39 |
TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) |
39 |
TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) |
| 40 |
|
40 |
|
| 41 |
@@ -89,14 +76,34 @@ ENDIF(WIN32) |
41 |
@@ -90,14 +77,34 @@ ENDIF(WIN32) |
| 42 |
ADD_EXECUTABLE(async_example async_example.c) |
42 |
ADD_EXECUTABLE(async_example async_example.c) |
| 43 |
TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB}) |
43 |
TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB}) |
| 44 |
|
44 |
|