[QGIS Commit] r15201 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-02-18 08:15:08 -0800 (Fri, 18 Feb 2011)
New Revision: 15201

Modified:
   trunk/qgis/src/app/CMakeLists.txt
Log:
missed a gcc warning

Modified: trunk/qgis/src/app/CMakeLists.txt
===================================================================
--- trunk/qgis/src/app/CMakeLists.txt	2011-02-18 15:33:27 UTC (rev 15200)
+++ trunk/qgis/src/app/CMakeLists.txt	2011-02-18 16:15:08 UTC (rev 15201)
@@ -213,7 +213,6 @@
   qgssponsors.h
   qgstextannotationdialog.h
   qgstilescalewidget.h
-  qgstip.h
   qgstipgui.h
   qgstipfactory.h
   qgsundowidget.h
@@ -326,9 +325,6 @@
 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 @@
   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}