diff options
| author | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-09-10 22:36:02 +0000 |
|---|---|---|
| committer | sleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2014-09-10 22:36:02 +0000 |
| commit | 82d0e4ff0025812870840f919086d971ccca66dc (patch) | |
| tree | 262e20b7c1f3df6769615da2fe6c9bd510854d03 /CMakeLists.txt | |
| parent | d07612b39e48cf55f097d5ba3d7bfbc5b63d6f58 (diff) | |
| download | navit-svn-82d0e4ff0025812870840f919086d971ccca66dc.tar.gz | |
Fix:build:Check if compiler options are supported before using them.|Allows building with GCC 3.3, to resolve #1144.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5892 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'CMakeLists.txt')
| -rwxr-xr-x | CMakeLists.txt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 366de214..9dc35136 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -657,16 +657,15 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY # functions implementing the interface of a plugin. # -Wno-sign-compare: We currently just use int almost everywhere. # Unclear if it's really worth correcting. -include(CheckCCompilerFlag) if(CMAKE_COMPILER_IS_GNUCC OR CCMAKE_COMPILER_IS_GNUCXX) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wundef -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -Wstrict-prototypes ") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wundef -Wcast-align -Wpointer-arith -Wextra -Wno-unused-parameter -Wno-sign-compare ") - # -Wno-missing-field-initializers does not work with old gcc - check_c_compiler_flag(-Wno-missing-field-initializers HAS_NO_MISSING_FIELD_INI) - if (HAS_NO_MISSING_FIELD_INI) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-missing-field-initializers ") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-field-initializers ") - endif() + set(COMMON_COMPILER_FLAGS "-Wall -Wundef -Wcast-align -Wpointer-arith -Wno-unused-parameter -Wno-sign-compare") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} ${COMMON_COMPILER_FLAGS}") + # flags not available in old GCC versions, or not for both C and C++ + add_compiler_flag_if_available("-Wno-missing-field-initializers") + add_compiler_flag_if_available("-Wextra") + add_compiler_flag_if_available("-Wmissing-prototypes") + add_compiler_flag_if_available("-Wstrict-prototypes ") endif() if (EXTRA_DEFINES) |