File tree Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Expand file tree Collapse file tree 1 file changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -213,7 +213,6 @@ SET (QGIS_APP_MOC_HDRS
213
213
qgssponsors.h
214
214
qgstextannotationdialog.h
215
215
qgstilescalewidget.h
216
- qgstip.h
217
216
qgstipgui.h
218
217
qgstipfactory.h
219
218
qgsundowidget.h
@@ -326,9 +325,6 @@ QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
326
325
IF (WIN32 )
327
326
IF (MSVC )
328
327
SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR} /qgis_win32.rc )
329
-
330
- # disable deprecation warnings
331
- SET_SOURCE_FILES_PROPERTIES (qgisappinterface.cpp PROPERTIES COMPILE_FLAGS /wd4996 )
332
328
ELSE (MSVC )
333
329
334
330
# Icon for windows MINGW
@@ -351,6 +347,15 @@ IF (WIN32)
351
347
ENDIF (MSVC )
352
348
ENDIF (WIN32 )
353
349
350
+ IF (PEDANTIC )
351
+ # disable deprecation warnings
352
+ IF (MSVC )
353
+ SET_SOURCE_FILES_PROPERTIES (qgisappinterface.cpp PROPERTIES COMPILE_FLAGS /wd4996 )
354
+ ELSE (MSVC )
355
+ SET_SOURCE_FILES_PROPERTIES (qgisappinterface.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated )
356
+ ENDIF (MSVC )
357
+ ENDIF (PEDANTIC )
358
+
354
359
INCLUDE_DIRECTORIES (
355
360
${CMAKE_CURRENT_SOURCE_DIR} composer legend attributetable
356
361
${CMAKE_CURRENT_BINARY_DIR}
You can’t perform that action at this time.
0 commit comments