Changeset View
Changeset View
Standalone View
Standalone View
head/databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt
Property | Old Value | New Value |
---|---|---|
fbsd:nokeywords | null | yes \ No newline at end of property |
svn:eol-style | null | native \ No newline at end of property |
svn:mime-type | null | text/plain \ No newline at end of property |
--- scripts/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC | |||||
+++ scripts/CMakeLists.txt | |||||
@@ -298,6 +298,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() | |||||
@@ -360,15 +362,10 @@ ELSE() | |||||
# On Unix, most of the files end up in the bin directory | |||||
SET(mysql_config_COMPONENT COMPONENT Development) | |||||
SET(BIN_SCRIPTS | |||||
- msql2mysql | |||||
- mysql_config | |||||
mysql_fix_extensions | |||||
mysql_setpermission | |||||
mysql_zap | |||||
- mysqlaccess | |||||
- mysqlaccess.conf | |||||
mysql_convert_table_format | |||||
- mysql_find_rows | |||||
mysqlhotcopy | |||||
mysqldumpslow | |||||
mysqld_multi | |||||
@@ -378,7 +375,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) |