b8d235ae4f
Changelog: https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-28.html Sponsored by: Netzkommune GmbH
53 lines
1.6 KiB
Plaintext
53 lines
1.6 KiB
Plaintext
--- scripts/CMakeLists.txt.orig 2021-12-17 16:07:27 UTC
|
|
+++ scripts/CMakeLists.txt
|
|
@@ -323,6 +323,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()
|
|
@@ -396,7 +398,7 @@ ELSE()
|
|
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
ESCAPE_QUOTES @ONLY)
|
|
|
|
- IF(INSTALL_PKGCONFIGDIR)
|
|
+ IF(INSTALL_PKGCONFIGDIR AND NOT WITHOUT_CLIENTLIBS)
|
|
MESSAGE(STATUS "INSTALL ${PKGCONFIG_FILE} ${INSTALL_PKGCONFIGDIR}")
|
|
INSTALL(FILES
|
|
${CMAKE_CURRENT_BINARY_DIR}/${PKGCONFIG_FILE}
|
|
@@ -409,23 +411,28 @@ ELSE()
|
|
# mysqld_safe used in mtr even for systemd platforms
|
|
IF(WITH_SYSTEMD)
|
|
SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
mysqldumpslow
|
|
mysqld_safe
|
|
)
|
|
ELSE()
|
|
SET(BIN_SCRIPTS
|
|
- mysql_config
|
|
mysqldumpslow
|
|
mysqld_multi
|
|
mysqld_safe
|
|
)
|
|
ENDIF()
|
|
|
|
+ IF(NOT WITHOUT_CLIENTLIBS)
|
|
+ SET(BIN_SCRIPTS
|
|
+ ${BIN_SCRIPTS}
|
|
+ mysql_config
|
|
+ )
|
|
+ ENDIF(NOT WITHOUT_CLIENTLIBS)
|
|
+
|
|
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}.pl.in)
|
|
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.pl.in
|