Commit f934dcaf authored by Mathias Goldau's avatar Mathias Goldau
Browse files

[FIX #230] When the same directory is used one time with SYSTEM flag in...

[FIX #230] When the same directory is used one time with SYSTEM flag in INCLUDE_DIRECTORIES within a CMakeLists.txt and another time without the flag it may result unflagged. Hence now also QT includes are flagged as system includes (of course which they really are) as well as OpenGL.
parent be83f100
......@@ -41,7 +41,7 @@ FIND_PACKAGE( Qt4 REQUIRED )
MARK_AS_ADVANCED( FORCE QT_QMAKE_EXECUTABLE )
# Includes:
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( SYSTEM ${QT_INCLUDE_DIR} )
# Libraries for linking:
SET( QT_LIBS ${QT_QTCORE_LIBRARY}
......
......@@ -258,7 +258,7 @@ FUNCTION( BUILD_SYSTEM_COMPILER )
# MESSAGE( STATUS "CMAKE_C_FLAGS = ${CMAKE_C_FLAGS}" )
# Supress compilation warnings from includes residing in system paths, see #230 for further details.
SET( CMAKE_INCLUDE_SYSTEM_FLAG_CXX "isystem" )
SET( CMAKE_INCLUDE_SYSTEM_FLAG_CXX "-isystem" CACHE STRING "" FORCE )
ENDFUNCTION( BUILD_SYSTEM_COMPILER )
......@@ -338,7 +338,7 @@ IF( ANDROID )
ELSE()
FIND_PACKAGE( OpenGL REQUIRED )
# include the OpenGL header paths
INCLUDE_DIRECTORIES( ${OPENGL_INCLUDE_DIR} )
INCLUDE_DIRECTORIES( SYSTEM ${OPENGL_INCLUDE_DIR} )
ENDIF()
# -----------------------------------------------------------------------------------------------------------------------------------------------
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment