Lines 1-6
Link Here
|
1 |
--- scripts/CMakeLists.txt.orig 2012-11-28 17:49:47.000000000 +0200 |
1 |
--- scripts/CMakeLists.txt.orig 2014-04-15 14:02:28.000000000 +0300 |
2 |
+++ scripts/CMakeLists.txt 2012-12-22 23:26:51.000000000 +0200 |
2 |
+++ scripts/CMakeLists.txt 2014-05-16 19:02:48.000000000 +0300 |
3 |
@@ -71,6 +71,7 @@ |
3 |
@@ -72,6 +72,7 @@ |
4 |
) |
4 |
) |
5 |
ENDIF() |
5 |
ENDIF() |
6 |
|
6 |
|
Lines 8-14
Link Here
|
8 |
INSTALL(FILES |
8 |
INSTALL(FILES |
9 |
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql |
9 |
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql |
10 |
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql |
10 |
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql |
11 |
@@ -79,6 +80,7 @@ |
11 |
@@ -81,6 +82,7 @@ |
12 |
${FIX_PRIVILEGES_SQL} |
12 |
${FIX_PRIVILEGES_SQL} |
13 |
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server |
13 |
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server |
14 |
) |
14 |
) |
Lines 16-22
Link Here
|
16 |
|
16 |
|
17 |
# TCMalloc hacks |
17 |
# TCMalloc hacks |
18 |
IF(MALLOC_LIB) |
18 |
IF(MALLOC_LIB) |
19 |
@@ -138,6 +140,7 @@ |
19 |
@@ -140,6 +142,7 @@ |
20 |
SET(HOSTNAME "hostname") |
20 |
SET(HOSTNAME "hostname") |
21 |
SET(MYSQLD_USER "mysql") |
21 |
SET(MYSQLD_USER "mysql") |
22 |
|
22 |
|
Lines 24-30
Link Here
|
24 |
# Required for mysqlbug until autotools are deprecated, once done remove these |
24 |
# Required for mysqlbug until autotools are deprecated, once done remove these |
25 |
# and expand default cmake variables |
25 |
# and expand default cmake variables |
26 |
SET(CC ${CMAKE_C_COMPILER}) |
26 |
SET(CC ${CMAKE_C_COMPILER}) |
27 |
@@ -174,6 +177,7 @@ |
27 |
@@ -180,6 +183,7 @@ |
28 |
DESTINATION ${INSTALL_BINDIR} |
28 |
DESTINATION ${INSTALL_BINDIR} |
29 |
COMPONENT Server |
29 |
COMPONENT Server |
30 |
) |
30 |
) |
Lines 32-38
Link Here
|
32 |
|
32 |
|
33 |
ENDIF(UNIX) |
33 |
ENDIF(UNIX) |
34 |
|
34 |
|
35 |
@@ -198,6 +202,7 @@ |
35 |
@@ -204,6 +208,7 @@ |
36 |
SET(localstatedir ${MYSQL_DATADIR}) |
36 |
SET(localstatedir ${MYSQL_DATADIR}) |
37 |
ENDIF() |
37 |
ENDIF() |
38 |
|
38 |
|
Lines 40-63
Link Here
|
40 |
IF(UNIX) |
40 |
IF(UNIX) |
41 |
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh |
41 |
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh |
42 |
${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) |
42 |
${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) |
43 |
@@ -209,6 +214,7 @@ |
43 |
@@ -219,6 +224,7 @@ |
44 |
COMPONENT Server |
44 |
COMPONENT Server |
45 |
) |
45 |
) |
46 |
ENDIF() |
46 |
ENDIF() |
47 |
+ENDIF() |
47 |
+ENDIF() |
48 |
|
48 |
|
49 |
|
|
|
50 |
SET(prefix "${CMAKE_INSTALL_PREFIX}") |
49 |
SET(prefix "${CMAKE_INSTALL_PREFIX}") |
51 |
@@ -260,6 +266,8 @@ |
50 |
SET(sysconfdir ${prefix}) |
52 |
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) |
51 |
@@ -276,6 +282,8 @@ |
53 |
STRING(REGEX REPLACE "^lib" "" lib "${lib}") |
52 |
STRING(REGEX REPLACE "^lib" "" lib "${lib}") |
54 |
SET(${var} "${${var}}-l${lib} " ) |
53 |
SET(${var} "${${var}}-l${lib} " ) |
|
|
54 |
ENDIF() |
55 |
+ ELSEIF(lib STREQUAL "-pthread") |
55 |
+ ELSEIF(lib STREQUAL "-pthread") |
56 |
+ SET(${var} "${${var}}-pthread " ) |
56 |
+ SET(${var} "${${var}}-pthread " ) |
57 |
ELSE() |
57 |
ELSE() |
58 |
SET(${var} "${${var}}-l${lib} " ) |
58 |
SET(${var} "${${var}}-l${lib} " ) |
59 |
ENDIF() |
59 |
ENDIF() |
60 |
@@ -315,18 +323,8 @@ |
60 |
@@ -334,18 +342,8 @@ |
61 |
SET(BIN_SCRIPTS |
61 |
SET(BIN_SCRIPTS |
62 |
msql2mysql |
62 |
msql2mysql |
63 |
mysql_config |
63 |
mysql_config |