summaryrefslogtreecommitdiff
path: root/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'databases/mysql56-client/files/patch-scripts_CMakeLists.txt')
-rw-r--r--databases/mysql56-client/files/patch-scripts_CMakeLists.txt26
1 files changed, 13 insertions, 13 deletions
diff --git a/databases/mysql56-client/files/patch-scripts_CMakeLists.txt b/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
index 0235dc2f305f..9d16479b0067 100644
--- a/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
+++ b/databases/mysql56-client/files/patch-scripts_CMakeLists.txt
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100
-+++ scripts/CMakeLists.txt 2013-02-13 14:14:11.000000000 +0100
-@@ -71,6 +71,7 @@
+--- scripts/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC
++++ scripts/CMakeLists.txt
+@@ -71,6 +71,7 @@ IF(UNIX)
)
ENDIF()
@@ -8,7 +8,7 @@
INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql
${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
-@@ -80,6 +81,7 @@
+@@ -80,6 +81,7 @@ INSTALL(FILES
${FIX_PRIVILEGES_SQL}
DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
)
@@ -16,7 +16,7 @@
# TCMalloc hacks
IF(MALLOC_LIB)
-@@ -139,6 +141,7 @@
+@@ -168,6 +170,7 @@ ENDIF()
SET(HOSTNAME "hostname")
SET(MYSQLD_USER "mysql")
@@ -24,7 +24,7 @@
# Required for mysqlbug until autotools are deprecated, once done remove these
# and expand default cmake variables
SET(CC ${CMAKE_C_COMPILER})
-@@ -175,6 +178,7 @@
+@@ -204,6 +207,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI
DESTINATION ${INSTALL_BINDIR}
COMPONENT Server
)
@@ -32,7 +32,7 @@
ENDIF(UNIX)
-@@ -199,6 +203,7 @@
+@@ -228,6 +232,7 @@ ELSE()
SET(localstatedir ${MYSQL_DATADIR})
ENDIF()
@@ -40,15 +40,15 @@
IF(UNIX)
SET(EXT)
ELSE()
-@@ -213,6 +218,7 @@
+@@ -242,6 +247,7 @@ INSTALL_SCRIPT(
DESTINATION ${DEST}
COMPONENT Server
)
+ENDIF()
-
SET(prefix "${CMAKE_INSTALL_PREFIX}")
-@@ -264,6 +270,8 @@
+ SET(sysconfdir ${prefix})
+@@ -298,6 +304,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
STRING(REGEX REPLACE "^lib" "" lib "${lib}")
SET(${var} "${${var}}-l${lib} " )
@@ -57,7 +57,7 @@
ELSE()
SET(${var} "${${var}}-l${lib} " )
ENDIF()
-@@ -316,17 +324,9 @@
+@@ -353,17 +361,9 @@ ELSE()
SET(BIN_SCRIPTS
msql2mysql
mysql_config
@@ -75,7 +75,7 @@
)
FOREACH(file ${BIN_SCRIPTS})
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
-@@ -350,6 +350,7 @@
+@@ -387,6 +387,7 @@ ELSE()
)
ENDFOREACH()
@@ -83,7 +83,7 @@
# Input files with pl.in extension - drop the extension completely
SET(PLIN_FILES mysql_secure_installation)
FOREACH(file ${PLIN_FILES})
-@@ -362,6 +363,7 @@
+@@ -399,6 +400,7 @@ ELSE()
INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT})
ENDFOREACH()
ENDIF()