summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorsleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220>2013-08-22 21:58:34 +0000
committersleske <sleske@ffa7fe5e-494d-0410-b361-a75ebd5db220>2013-08-22 21:58:34 +0000
commit09c3f1734a5219b7bb059c10751287c081ef0b30 (patch)
tree798ef42b227e592d0bd4ebae75abdcc19fedc419 /CMakeLists.txt
parent995a2e17e6f3f02ddfb56c896fdcdaf6aba49dcd (diff)
downloadnavit-svn-09c3f1734a5219b7bb059c10751287c081ef0b30.tar.gz
Fix:core:Build with -Wstrict-prototypes, fix warnings.
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5589 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'CMakeLists.txt')
-rwxr-xr-xCMakeLists.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 739f7060..61e279ee 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,6 +266,8 @@ if (QT_FOUND)
endif(QT_FOUND)
if(GTK2_FOUND)
+ # Include gtk.h with "SYSTEM" to avoid GCC compiler warning for gtkitemfactory.h.
+ include_directories(SYSTEM ${GTK2_GTK_INCLUDE_DIR})
include_directories(${GTK2_INCLUDE_DIRS})
set(HAVE_GTK2 1)
set_with_reason(gui/gtk "GTK libs found" TRUE ${GTK2_LIBRARIES})
@@ -642,7 +644,7 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY
# -Wno-sign-compare: We currently just use int almost everywhere.
# Unclear if it's really worth correcting.
if(CMAKE_COMPILER_IS_GNUCC OR CCMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes ")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare -Wmissing-prototypes -Wstrict-prototypes ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wcast-align -Wpointer-arith -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-sign-compare ")
endif()