|
8 | 8 | +TARGET_LINK_LIBRARIES(client_base mysqlclient) |
9 | 9 | --- client/CMakeLists.txt 2018-08-18 03:29:59.708213642 -0400 |
10 | 10 | +++ client/CMakeLists.txt 2018-08-18 03:29:59.712547041 -0400 |
11 | | -@@ -48,13 +48,13 @@ |
| 11 | +@@ -49,13 +49,13 @@ |
12 | 12 | client_query_attributes.cc |
13 | 13 | multi_factor_passwordopt-vars.cc |
14 | 14 | ${CMAKE_CURRENT_SOURCE_DIR}/common/user_registration.cc |
15 | 15 | - LINK_LIBRARIES perconaserverclient client_base ${MY_XLINE_LIBRARY} |
16 | 16 | + LINK_LIBRARIES mysqlclient client_base ${MY_XLINE_LIBRARY} |
17 | 17 | ) |
18 | | - |
| 18 | + |
19 | 19 | IF(NOT WITHOUT_SERVER) |
20 | 20 | MYSQL_ADD_EXECUTABLE(mysql_upgrade |
21 | 21 | upgrade/program.cc |
22 | 22 | - LINK_LIBRARIES perconaserverclient client_base |
23 | 23 | + LINK_LIBRARIES mysqlclient client_base |
24 | 24 | ) |
25 | 25 | ENDIF() |
26 | | - |
27 | | -@@ -72,7 +72,7 @@ |
| 26 | + |
| 27 | +@@ -73,37 +73,32 @@ |
28 | 28 | COMPONENT Test |
29 | 29 | DEPENDENCIES GenError GenClientError |
30 | 30 | ENABLE_EXPORTS |
31 | 31 | - LINK_LIBRARIES perconaserverclient |
32 | 32 | + LINK_LIBRARIES mysqlclient |
33 | 33 | ) |
| 34 | +- |
34 | 35 | IF (WITH_COREDUMPER) |
35 | 36 | TARGET_LINK_LIBRARIES(mysqltest coredumper) |
36 | | -@@ -82,22 +82,22 @@ |
| 37 | + ENDIF() |
| 38 | + |
| 39 | +-IF(MY_COMPILER_IS_GNU AND (WITH_LTO OR CMAKE_COMPILER_FLAG_WITH_LTO)) |
| 40 | +- TARGET_LINK_OPTIONS(mysqltest PRIVATE -Wno-error=stringop-overflow) |
| 41 | +-ENDIF() |
| 42 | +- |
| 43 | + MYSQL_ADD_EXECUTABLE(mysqlcheck |
37 | 44 | check/mysqlcheck.cc |
38 | 45 | check/mysqlcheck_core.cc |
39 | 46 | multi_factor_passwordopt-vars.cc |
|
58 | 65 | - LINK_LIBRARIES perconaserverclient |
59 | 66 | + LINK_LIBRARIES mysqlclient |
60 | 67 | ) |
61 | | - |
| 68 | + |
62 | 69 | OPTION(WITH_JSON_BINLOG_LIBRARY |
63 | | -@@ -229,7 +229,7 @@ |
| 70 | +@@ -269,7 +264,8 @@ |
64 | 71 | SET(MYSQLBINLOG_LIBRARIES |
65 | 72 | binlogevents_static |
66 | 73 | client_base |
67 | 74 | - perconaserverclient |
68 | 75 | + mysqlclient |
| 76 | ++ extra::rapidjson |
69 | 77 | ) |
70 | | - |
| 78 | + |
71 | 79 | IF(WITH_JSON_BINLOG_LIBRARY) |
72 | | -@@ -263,20 +263,20 @@ |
| 80 | +@@ -311,20 +307,20 @@ |
73 | 81 | MYSQL_ADD_EXECUTABLE(mysqladmin |
74 | 82 | mysqladmin.cc |
75 | 83 | multi_factor_passwordopt-vars.cc |
|
0 commit comments