|
Lines 1-6
Link Here
|
| 1 |
--- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC |
1 |
--- scripts/CMakeLists.txt.orig 2019-06-10 10:43:20.000000000 -0400 |
| 2 |
+++ scripts/CMakeLists.txt |
2 |
+++ scripts/CMakeLists.txt 2019-08-01 10:59:24.177559000 -0400 |
| 3 |
@@ -43,6 +43,7 @@ ELSE() |
3 |
@@ -46,6 +46,7 @@ |
| 4 |
MESSAGE(FATAL_ERROR "Cannot concatenate files") |
4 |
MESSAGE(FATAL_ERROR "Cannot concatenate files") |
| 5 |
ENDIF() |
5 |
ENDIF() |
| 6 |
|
6 |
|
|
Lines 8-14
Link Here
|
| 8 |
# Build mysql_fix_privilege_tables.c |
8 |
# Build mysql_fix_privilege_tables.c |
| 9 |
ADD_CUSTOM_COMMAND( |
9 |
ADD_CUSTOM_COMMAND( |
| 10 |
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c |
10 |
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c |
| 11 |
@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs |
11 |
@@ -66,6 +67,7 @@ |
| 12 |
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c |
12 |
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c |
| 13 |
${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h |
13 |
${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h |
| 14 |
) |
14 |
) |
|
Lines 16-22
Link Here
|
| 16 |
|
16 |
|
| 17 |
# If we do not have performance schema compiled in then sys will not work, |
17 |
# If we do not have performance schema compiled in then sys will not work, |
| 18 |
# so only create an empty sys database with an auto-generated file, |
18 |
# so only create an empty sys database with an auto-generated file, |
| 19 |
@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER) |
19 |
@@ -146,6 +148,7 @@ |
| 20 |
) |
20 |
) |
| 21 |
ENDIF() |
21 |
ENDIF() |
| 22 |
|
22 |
|
|
Lines 24-30
Link Here
|
| 24 |
IF(UNIX) |
24 |
IF(UNIX) |
| 25 |
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution |
25 |
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution |
| 26 |
"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) |
26 |
"cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) |
| 27 |
@@ -150,6 +153,7 @@ IF(UNIX) |
27 |
@@ -153,6 +156,7 @@ |
| 28 |
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution |
28 |
COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution |
| 29 |
) |
29 |
) |
| 30 |
ENDIF() |
30 |
ENDIF() |
|
Lines 32-47
Link Here
|
| 32 |
|
32 |
|
| 33 |
IF(NOT WITHOUT_SERVER) |
33 |
IF(NOT WITHOUT_SERVER) |
| 34 |
INSTALL(FILES |
34 |
INSTALL(FILES |
| 35 |
@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) |
35 |
@@ -326,6 +330,8 @@ |
| 36 |
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) |
36 |
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) |
| 37 |
STRING(REGEX REPLACE "^lib" "" lib "${lib}") |
37 |
STRING(REGEX REPLACE "^lib" "" lib "${lib}") |
| 38 |
SET(${var} "${${var}}-l${lib} " ) |
38 |
SET(${var} "${${var}}-l${lib} " ) |
| 39 |
+ ELSEIF(lib STREQUAL "-pthread") |
39 |
+ ELSEIF(lib STREQUAL "-pthread") |
| 40 |
+ SET(${var} "${${var}}-pthread " ) |
40 |
+ SET(${var} "${${var}}-pthread " ) |
| 41 |
ELSE() |
41 |
ELSE() |
| 42 |
SET(${var} "${${var}}-l${lib} " ) |
42 |
SET(${var} "${${var}}-l${lib} " ) |
| 43 |
ENDIF() |
43 |
ENDIF() |
| 44 |
@@ -430,19 +436,7 @@ ELSE() |
44 |
@@ -411,19 +417,7 @@ |
| 45 |
# On Unix, most of the files end up in the bin directory |
45 |
# On Unix, most of the files end up in the bin directory |
| 46 |
SET(mysql_config_COMPONENT COMPONENT Development) |
46 |
SET(mysql_config_COMPONENT COMPONENT Development) |
| 47 |
|
47 |
|