missed a gcc warning

git-svn-id: http://svn.osgeo.org/qgis/trunk@15201 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 18, 2011 · f2c4b96 · f2c4b96
1 parent ff404a9
commit f2c4b96
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -213,7 +213,6 @@ SET (QGIS_APP_MOC_HDRS
   qgssponsors.h
   qgstextannotationdialog.h
   qgstilescalewidget.h
-  qgstip.h
   qgstipgui.h
   qgstipfactory.h
   qgsundowidget.h
@@ -326,9 +325,6 @@ QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
 IF (WIN32)
   IF (MSVC)
     SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc)
-
-    # disable deprecation warnings
-    SET_SOURCE_FILES_PROPERTIES(qgisappinterface.cpp PROPERTIES COMPILE_FLAGS /wd4996)
   ELSE(MSVC)
 
     # Icon for windows MINGW
@@ -351,6 +347,15 @@ IF (WIN32)
   ENDIF (MSVC)
 ENDIF (WIN32)
 
+IF(PEDANTIC)
+  # disable deprecation warnings
+  IF(MSVC)
+    SET_SOURCE_FILES_PROPERTIES(qgisappinterface.cpp PROPERTIES COMPILE_FLAGS /wd4996)
+  ELSE(MSVC)
+    SET_SOURCE_FILES_PROPERTIES(qgisappinterface.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated)
+  ENDIF(MSVC)
+ENDIF(PEDANTIC)
+
 INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_SOURCE_DIR} composer legend attributetable
   ${CMAKE_CURRENT_BINARY_DIR}