mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG
Bug#17959689: MAKE GCC AND CLANG GIVE CONSISTENT COMPILATION WARNINGS Bug#18313717: ENABLE -WERROR IN MAINTANER MODE WHEN COMPILING WITH CLANG Bug#18510941: REMOVE CMAKE WORKAROUNDS FOR OLDER VERSIONS OF OS X/XCODE Backport from mysql-5.6 to mysql-5.5
This commit is contained in:
parent
a3cc647dbd
commit
8b64f82505
13 changed files with 187 additions and 117 deletions
|
|
@ -93,6 +93,14 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
|
|||
)
|
||||
|
||||
|
||||
# These files have unused result errors, so we skip Werror
|
||||
CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
|
||||
IF(HAVE_WERROR_FLAG)
|
||||
INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
|
||||
ADD_COMPILE_FLAGS(../sql/filesort.cc COMPILE_FLAGS "-Wno-error")
|
||||
ADD_COMPILE_FLAGS(../sql/opt_range.cc COMPILE_FLAGS "-Wno-error")
|
||||
ENDIF()
|
||||
|
||||
ADD_CONVENIENCE_LIBRARY(sql_embedded ${SQL_EMBEDDED_SOURCES})
|
||||
DTRACE_INSTRUMENT(sql_embedded)
|
||||
ADD_DEPENDENCIES(sql_embedded GenError GenServerSource)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue