sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-22 00:06:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add OVERRIDE macro, allows "override" keyword when c++11 is available

Browse Source 
...and no errors when compiler is not capable of c++11 builds.
This commit is contained in:
Nyall Dawson 2015-01-14 19:38:21 +11:00
parent 8ab4472107
commit 466f2563ef
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -319,6 +319,30 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
NO_DEFAULT_PATH
)
#############################################################
# enable use of c++11 features where available
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
IF (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
SET(USE_CXX_11 TRUE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
ENDIF()
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
SET(USE_CXX_11 TRUE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
ELSE()
SET(USE_CXX_11 FALSE)
ENDIF()
#allow override keyword if available
IF (USE_CXX_11)
SET(OVERRIDEKEYWORD "override")
ELSE()
SET(OVERRIDEKEYWORD "")
ENDIF()
ADD_DEFINITIONS("-DOVERRIDE=${OVERRIDEKEYWORD}")
#############################################################
# enable warnings

2
src/core/symbology-ng/qgsvectorcolorrampv2.h
View File

@ -70,7 +70,7 @@ class CORE_EXPORT QgsVectorGradientColorRampV2 : public QgsVectorColorRampV2
virtual double value( int index ) const;
virtual QColor color( double value ) const;
virtual QColor color( double value ) const OVERRIDE;
virtual QString type() const { return "gradient"; }