Skip to content

Commit 466f256

Browse files
committed
Add OVERRIDE macro, allows "override" keyword when c++11 is available
...and no errors when compiler is not capable of c++11 builds.
1 parent 8ab4472 commit 466f256

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

CMakeLists.txt

+24
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,30 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
319319
NO_DEFAULT_PATH
320320
)
321321

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+
322346
#############################################################
323347
# enable warnings
324348

src/core/symbology-ng/qgsvectorcolorrampv2.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class CORE_EXPORT QgsVectorGradientColorRampV2 : public QgsVectorColorRampV2
7070

7171
virtual double value( int index ) const;
7272

73-
virtual QColor color( double value ) const;
73+
virtual QColor color( double value ) const OVERRIDE;
7474

7575
virtual QString type() const { return "gradient"; }
7676

0 commit comments

Comments
 (0)