| 1 |
From: Julian Ospald <hasufell@gentoo.org>
|
| 2 |
Date: Wed Jun 27 22:04:32 UTC 2012
|
| 3 |
Subject: build system
|
| 4 |
|
| 5 |
respect flags
|
| 6 |
|
| 7 |
--- CMakeLists.txt
|
| 8 |
+++ CMakeLists.txt
|
| 9 |
@@ -365,21 +365,6 @@
|
| 10 |
|
| 11 |
endif()
|
| 12 |
|
| 13 |
- # Warning level
|
| 14 |
- add_cxxflag("-Wall")
|
| 15 |
- add_cxxflag("-Wextra")
|
| 16 |
- add_cxxflag("-Wformat=2")
|
| 17 |
- add_cxxflag("-Wundef")
|
| 18 |
- add_cxxflag("-Wpointer-arith")
|
| 19 |
- add_cxxflag("-Wcast-qual")
|
| 20 |
- add_cxxflag("-Woverloaded-virtual")
|
| 21 |
- add_cxxflag("-Wlogical-op")
|
| 22 |
-
|
| 23 |
- add_cxxflag("-Wliteral-conversion")
|
| 24 |
- add_cxxflag("-Wshift-overflow")
|
| 25 |
- add_cxxflag("-Woverflow")
|
| 26 |
- add_cxxflag("-Wbool-conversions")
|
| 27 |
-
|
| 28 |
# TODO enable:
|
| 29 |
# add_cxxflag("-Wconversion") # very noisy
|
| 30 |
# add_cxxflag("-Wsign-conversion") # very noisy
|
| 31 |
@@ -391,27 +376,12 @@
|
| 32 |
endif()
|
| 33 |
|
| 34 |
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
| 35 |
-
|
| 36 |
- #Debug
|
| 37 |
add_definitions(-D_DEBUG)
|
| 38 |
-
|
| 39 |
- check_compiler_flag(RESULT "-g3")
|
| 40 |
- if(NOT RESULT STREQUAL "")
|
| 41 |
- string(REGEX REPLACE "-g(|[0-9]|gdb)" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
| 42 |
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${RESULT}")
|
| 43 |
- endif()
|
| 44 |
-
|
| 45 |
- check_compiler_flag(RESULT "-O0")
|
| 46 |
- string(REGEX REPLACE "-O[0-9]" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
|
| 47 |
- set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${RESULT}")
|
| 48 |
-
|
| 49 |
elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
|
| 50 |
-
|
| 51 |
if((NOT CMAKE_CXX_FLAGS MATCHES "-g(|[0-9]|gdb)")
|
| 52 |
AND (NOT CMAKE_CXX_FLAGS_RELEASE MATCHES "-g(|[0-9]|gdb)"))
|
| 53 |
add_cxxflag("-g2")
|
| 54 |
endif()
|
| 55 |
-
|
| 56 |
endif()
|
| 57 |
|
| 58 |
if(DEBUG_EXTRA)
|
| 59 |
@@ -419,15 +389,7 @@
|
| 60 |
add_cxxflag("-fbounds-checking")
|
| 61 |
add_cxxflag("-fcatch-undefined-behavior")
|
| 62 |
add_cxxflag("-Wstrict-aliasing=1")
|
| 63 |
- else()
|
| 64 |
- # -Wuninitialized causes too many false positives
|
| 65 |
- add_cxxflag("-Wno-uninitialized")
|
| 66 |
- # (clang only) Conflicts with using const variables for configuration.
|
| 67 |
- add_cxxflag("-Wno-constant-logical-operand")
|
| 68 |
endif()
|
| 69 |
-
|
| 70 |
- # Because we are lazy
|
| 71 |
- add_ldflag("-Wl,--as-needed")
|
| 72 |
|
| 73 |
# Xcode does not support -isystem yet
|
| 74 |
if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
|
Parent Directory
| 
Revision Log