86aa476560
Fix build on arm [1] PR: 197550 [1] Submitted by: mikael.urankar@gmail.com [1] Tested by: sbruno [1]
38 lines
1.3 KiB
Text
38 lines
1.3 KiB
Text
--- scripts/CMakeLists.txt.orig 2015-02-05 14:28:58.000000000 +0100
|
|
+++ scripts/CMakeLists.txt 2015-02-12 23:25:55.432292000 +0100
|
|
@@ -273,6 +273,8 @@
|
|
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()
|
|
@@ -326,25 +328,19 @@
|
|
# 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
|
|
mysqld_safe
|
|
- ps_tokudb_admin
|
|
)
|
|
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)
|