File tree 2 files changed +25
-1
lines changed
2 files changed +25
-1
lines changed Original file line number Diff line number Diff line change @@ -319,6 +319,30 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
319
319
NO_DEFAULT_PATH
320
320
)
321
321
322
+ #############################################################
323
+ # enable use of c++11 features where available
324
+
325
+ IF ("${CMAKE_CXX_COMPILER_ID} " MATCHES "GNU" )
326
+ EXECUTE_PROCESS (COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
327
+ IF (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
328
+ SET (USE_CXX_11 TRUE )
329
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
330
+ ENDIF ()
331
+ ELSEIF ("${CMAKE_CXX_COMPILER_ID} " MATCHES "Clang" )
332
+ SET (USE_CXX_11 TRUE )
333
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
334
+ ELSE ()
335
+ SET (USE_CXX_11 FALSE )
336
+ ENDIF ()
337
+
338
+ #allow override keyword if available
339
+ IF (USE_CXX_11)
340
+ SET (OVERRIDEKEYWORD "override" )
341
+ ELSE ()
342
+ SET (OVERRIDEKEYWORD "" )
343
+ ENDIF ()
344
+ ADD_DEFINITIONS ("-DOVERRIDE=${OVERRIDEKEYWORD} " )
345
+
322
346
#############################################################
323
347
# enable warnings
324
348
Original file line number Diff line number Diff line change @@ -70,7 +70,7 @@ class CORE_EXPORT QgsVectorGradientColorRampV2 : public QgsVectorColorRampV2
70
70
71
71
virtual double value ( int index ) const ;
72
72
73
- virtual QColor color ( double value ) const ;
73
+ virtual QColor color ( double value ) const OVERRIDE ;
74
74
75
75
virtual QString type () const { return " gradient" ; }
76
76
You can’t perform that action at this time.
0 commit comments