--- scripts/CMakeLists.txt.orig 2016-11-28 13:36:22 UTC +++ scripts/CMakeLists.txt @@ -71,6 +71,7 @@ IF(UNIX) ) ENDIF() +IF(FALSE) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql @@ -80,6 +81,7 @@ INSTALL(FILES ${FIX_PRIVILEGES_SQL} DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server ) +ENDIF() # TCMalloc hacks IF(MALLOC_LIB) @@ -168,6 +170,7 @@ ENDIF() SET(HOSTNAME "hostname") SET(MYSQLD_USER "mysql") +IF(FALSE) # Required for mysqlbug until autotools are deprecated, once done remove these # and expand default cmake variables SET(CC ${CMAKE_C_COMPILER}) @@ -204,6 +207,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI DESTINATION ${INSTALL_BINDIR} COMPONENT Server ) +ENDIF() ENDIF(UNIX) @@ -228,6 +232,7 @@ ELSE() SET(localstatedir ${MYSQL_DATADIR}) ENDIF() +IF(FALSE) IF(UNIX) SET(EXT) ELSE() @@ -242,6 +247,7 @@ INSTALL_SCRIPT( DESTINATION ${DEST} COMPONENT Server ) +ENDIF() SET(prefix "${CMAKE_INSTALL_PREFIX}") SET(sysconfdir ${prefix}) @@ -298,6 +304,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() @@ -353,17 +361,9 @@ ELSE() 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 ) FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) @@ -387,6 +387,7 @@ ELSE() ) ENDFOREACH() +IF(FALSE) # Input files with pl.in extension - drop the extension completely SET(PLIN_FILES mysql_secure_installation) FOREACH(file ${PLIN_FILES}) @@ -399,6 +400,7 @@ ELSE() INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT}) ENDFOREACH() ENDIF() +ENDIF() # Install libgcc as mylibgcc.a IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static")