database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Bug#17633291: SET PROPER COMPILE OPTIONS FOR CLANG

Browse Source 
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:
Jon Olav Hauglid
2014-10-13 09:52:28 +02:00
parent a3cc647dbd
commit 8b64f82505
13 changed files with 187 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/CMakeLists.txt
View File

@ -88,16 +88,20 @@ ENDIF()
IF(CMAKE_GENERATOR MATCHES "Makefiles")
# Strip maintainer mode options if necessary
STRING(REPLACE "${MY_MAINTAINER_C_WARNINGS}" "" CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
STRING(REPLACE "${MY_MAINTAINER_CXX_WARNINGS}" "" CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
STRING(REPLACE "${MY_C_WARNING_FLAGS}" "" CFLAGS
"${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
STRING(REPLACE "${MY_CXX_WARNING_FLAGS}" "" CXXFLAGS
"${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
FOREACH(ARCH ${CMAKE_OSX_ARCHITECTURES})
SET(CFLAGS "${CFLAGS} -arch ${ARCH}")
SET(CXXFLAGS "${CXXFLAGS} -arch ${ARCH}")
ENDFOREACH()
ELSE()
# Strip maintainer mode options if necessary
STRING(REPLACE "${MY_MAINTAINER_C_WARNINGS}" "" CFLAGS "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
STRING(REPLACE "${MY_MAINTAINER_CXX_WARNINGS}" "" CXXFLAGS "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
STRING(REPLACE "${MY_C_WARNING_FLAGS}" "" CFLAGS
"${CMAKE_C_FLAGS_RELWITHDEBINFO}")
STRING(REPLACE "${MY_CXX_WARNING_FLAGS}" "" CXXFLAGS
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
ENDIF()
IF(UNIX)