From 073a60b2a16bb308c07b6085f10a6346490aa61d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 5 Mar 2010 15:08:03 +0000 Subject: [PATCH] Fixes for warning from qt headers --- examples/osgQtBrowser/CMakeLists.txt | 5 +++++ src/osgQt/CMakeLists.txt | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/examples/osgQtBrowser/CMakeLists.txt b/examples/osgQtBrowser/CMakeLists.txt index a45f96748..735a8a8cc 100644 --- a/examples/osgQtBrowser/CMakeLists.txt +++ b/examples/osgQtBrowser/CMakeLists.txt @@ -2,6 +2,11 @@ SET(TARGET_SRC osgQtBrowser.cpp ) +IF(CMAKE_COMPILER_IS_GNUCXX) + # Remove -pedantic flag as it barfs on Qt headers + STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +ENDIF() + SET(TARGET_EXTERNAL_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY}) INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR}) diff --git a/src/osgQt/CMakeLists.txt b/src/osgQt/CMakeLists.txt index a479abf04..649d4a9c5 100644 --- a/src/osgQt/CMakeLists.txt +++ b/src/osgQt/CMakeLists.txt @@ -41,6 +41,11 @@ LINK_INTERNAL(${LIB_NAME} OpenThreads ) +IF(CMAKE_COMPILER_IS_GNUCXX) + # Remove -pedantic flag as it barfs on Qt headers + STRING(REGEX REPLACE "-pedantic" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +ENDIF() + TARGET_LINK_LIBRARIES(${LIB_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTWEBKIT_LIBRARY}) INCLUDE_DIRECTORIES(${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})