Changeset View
Changeset View
Standalone View
Standalone View
databases/mysqlwsrep56-server/files/patch-scripts_CMakeLists.txt
| --- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 | --- scripts/CMakeLists.txt.orig 2017-01-25 07:58:07 UTC | ||||
| +++ scripts/CMakeLists.txt 2013-02-13 14:39:57.000000000 +0100 | +++ scripts/CMakeLists.txt | ||||
| @@ -264,6 +264,8 @@ | @@ -298,6 +298,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) | ||||
| GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) | GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) | ||||
| STRING(REGEX REPLACE "^lib" "" lib "${lib}") | STRING(REGEX REPLACE "^lib" "" lib "${lib}") | ||||
| SET(${var} "${${var}}-l${lib} " ) | SET(${var} "${${var}}-l${lib} " ) | ||||
| + ELSEIF(lib STREQUAL "-pthread") | + ELSEIF(lib STREQUAL "-pthread") | ||||
| + SET(${var} "${${var}}-pthread " ) | + SET(${var} "${${var}}-pthread " ) | ||||
| ELSE() | ELSE() | ||||
| SET(${var} "${${var}}-l${lib} " ) | SET(${var} "${${var}}-l${lib} " ) | ||||
| ENDIF() | ENDIF() | ||||
| @@ -314,15 +316,10 @@ | @@ -360,15 +362,10 @@ ELSE() | ||||
| # On Unix, most of the files end up in the bin directory | # On Unix, most of the files end up in the bin directory | ||||
| SET(mysql_config_COMPONENT COMPONENT Development) | SET(mysql_config_COMPONENT COMPONENT Development) | ||||
| SET(BIN_SCRIPTS | SET(BIN_SCRIPTS | ||||
| - msql2mysql | - msql2mysql | ||||
| - mysql_config | - mysql_config | ||||
| mysql_fix_extensions | mysql_fix_extensions | ||||
| mysql_setpermission | mysql_setpermission | ||||
| mysql_zap | mysql_zap | ||||
| - mysqlaccess | - mysqlaccess | ||||
| - mysqlaccess.conf | - mysqlaccess.conf | ||||
| mysql_convert_table_format | mysql_convert_table_format | ||||
| - mysql_find_rows | - mysql_find_rows | ||||
| mysqlhotcopy | mysqlhotcopy | ||||
| mysqldumpslow | mysqldumpslow | ||||
| mysqld_multi | mysqld_multi | ||||
| @@ -331,7 +328,7 @@ | @@ -378,7 +375,7 @@ ELSE() | ||||
| FOREACH(file ${BIN_SCRIPTS}) | FOREACH(file ${BIN_SCRIPTS}) | ||||
| IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) | IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) | ||||
| CONFIGURE_FILE(${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} ESCAPE_QUOTES @ONLY) | ||||
| + ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) | + ${CMAKE_CURRENT_BINARY_DIR}/${file} @ONLY) | ||||
| ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) | ELSEIF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}) | ||||
| CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} | CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file} | ||||
| ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) | ${CMAKE_CURRENT_BINARY_DIR}/${file} COPYONLY) | ||||