c93ab7fefa
This is a development snapshot of upcoming MySQL 8.0. PR: 215738 Submitted by: Mahdi Mokhtari <mokhi64@gmail.com> Reviewed by: matthew, feld Approved by: matthew (mentor), feld Differential Revision: https://reviews.freebsd.org/D9031
36 lines
1.2 KiB
Text
36 lines
1.2 KiB
Text
--- scripts/CMakeLists.txt.orig 2016-03-28 18:06:12 UTC
|
|
+++ scripts/CMakeLists.txt
|
|
@@ -347,6 +347,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} " )
|
|
+ ELSEIF(lib STREQUAL "-pthread")
|
|
+ SET(${var} "${${var}}-pthread " )
|
|
ELSE()
|
|
SET(${var} "${${var}}-l${lib} " )
|
|
ENDIF()
|
|
@@ -430,14 +432,13 @@ ELSE()
|
|
# On Unix, most of the files end up in the bin directory
|
|
SET(mysql_config_COMPONENT COMPONENT Development)
|
|
|
|
+
|
|
IF(WITH_SYSTEMD)
|
|
SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
mysqldumpslow
|
|
)
|
|
ELSE()
|
|
SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
mysqldumpslow
|
|
mysqld_multi
|
|
mysqld_safe
|
|
@@ -471,7 +472,7 @@ ELSE()
|
|
FOREACH(file ${BIN_SCRIPTS})
|
|
IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
|
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/${file} ESCAPE_QUOTES @ONLY)
|
|
+ ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY)
|
|
ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file})
|
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}
|
|
${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY)
|