Skip to content

Commit b58cf49

Browse files
author
jef
committed
missed a gcc warning
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15201 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent de50f76 commit b58cf49

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

src/app/CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ SET (QGIS_APP_MOC_HDRS
213213
qgssponsors.h
214214
qgstextannotationdialog.h
215215
qgstilescalewidget.h
216-
qgstip.h
217216
qgstipgui.h
218217
qgstipfactory.h
219218
qgsundowidget.h
@@ -326,9 +325,6 @@ QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})
326325
IF (WIN32)
327326
IF (MSVC)
328327
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)
332328
ELSE(MSVC)
333329

334330
# Icon for windows MINGW
@@ -351,6 +347,15 @@ IF (WIN32)
351347
ENDIF (MSVC)
352348
ENDIF (WIN32)
353349

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+
354359
INCLUDE_DIRECTORIES(
355360
${CMAKE_CURRENT_SOURCE_DIR} composer legend attributetable
356361
${CMAKE_CURRENT_BINARY_DIR}

0 commit comments

Comments
 (0)