sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-07 00:15:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Address cmake CMP0054 warnings

Browse Source
This commit is contained in:
Nyall Dawson 2015-07-05 15:50:17 +10:00
parent a6c3de3047
commit c5a58a7fb3
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -352,13 +352,13 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
# or definitely Apple LLVM 5.0 (based on LLVM 3.3svn, in Xcode 5+): # or definitely Apple LLVM 5.0 (based on LLVM 3.3svn, in Xcode 5+):
# https://gist.github.com/yamaya/2924292 # https://gist.github.com/yamaya/2924292
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU")
EXECUTE_PROCESS(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION) 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) IF (GCC_VERSION VERSION_GREATER 4.7 OR GCC_VERSION VERSION_EQUAL 4.7)
SET(USE_CXX_11 TRUE) SET(USE_CXX_11 TRUE)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
ENDIF() ENDIF()
ELSEIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
IF ((NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.2") IF ((NOT APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "3.2")
OR (APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.1")) OR (APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.1"))
SET(USE_CXX_11 TRUE) SET(USE_CXX_11 TRUE)
@ -432,13 +432,13 @@ IF (PEDANTIC)
ENDIF (PEDANTIC) ENDIF (PEDANTIC)
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Qunused-arguments")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Qunused-arguments")
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Qunused-arguments") SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Qunused-arguments")
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Qunused-arguments") SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Qunused-arguments")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Qunused-arguments") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Qunused-arguments")
ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)") IF(CMAKE_SYSTEM_PROCESSOR MATCHES "^(powerpc|ppc)")
# spatialite crashes on ppc - see bugs.debian.org/603986 # spatialite crashes on ppc - see bugs.debian.org/603986

6
src/analysis/CMakeLists.txt
View File

@ -23,7 +23,7 @@ SET(QGIS_ANALYSIS_SRCS
interpolation/Triangulation.cc interpolation/Triangulation.cc
interpolation/TriDecorator.cc interpolation/TriDecorator.cc
interpolation/Vector3D.cc interpolation/Vector3D.cc
raster/qgsalignraster.cpp raster/qgsalignraster.cpp
raster/qgsninecellfilter.cpp raster/qgsninecellfilter.cpp
raster/qgsruggednessfilter.cpp raster/qgsruggednessfilter.cpp
@ -73,14 +73,14 @@ IF (PEDANTIC AND MSVC)
) )
ENDIF (PEDANTIC AND MSVC) ENDIF (PEDANTIC AND MSVC)
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET_SOURCE_FILES_PROPERTIES( SET_SOURCE_FILES_PROPERTIES(
interpolation/qgstininterpolator.cpp interpolation/qgstininterpolator.cpp
interpolation/NormVecDecorator.cc interpolation/NormVecDecorator.cc
interpolation/CloughTocherInterpolator.cc interpolation/CloughTocherInterpolator.cc
PROPERTIES COMPILE_FLAGS "-Wno-overloaded-virtual" PROPERTIES COMPILE_FLAGS "-Wno-overloaded-virtual"
) )
ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
QT4_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS}) QT4_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS})

10
src/core/CMakeLists.txt
View File

@ -46,7 +46,7 @@ SET(QGIS_CORE_SRCS
diagram/qgspiediagram.cpp diagram/qgspiediagram.cpp
diagram/qgstextdiagram.cpp diagram/qgstextdiagram.cpp
diagram/qgshistogramdiagram.cpp diagram/qgshistogramdiagram.cpp
effects/qgsimageoperation.cpp effects/qgsimageoperation.cpp
effects/qgspainteffect.cpp effects/qgspainteffect.cpp
effects/qgseffectstack.cpp effects/qgseffectstack.cpp
@ -289,7 +289,7 @@ SET(QGIS_CORE_SRCS
raster/qgssinglebandpseudocolorrenderer.cpp raster/qgssinglebandpseudocolorrenderer.cpp
raster/qgsbrightnesscontrastfilter.cpp raster/qgsbrightnesscontrastfilter.cpp
raster/qgshuesaturationfilter.cpp raster/qgshuesaturationfilter.cpp
geometry/qgsabstractgeometryv2.cpp geometry/qgsabstractgeometryv2.cpp
geometry/qgscircularstringv2.cpp geometry/qgscircularstringv2.cpp
geometry/qgscompoundcurvev2.cpp geometry/qgscompoundcurvev2.cpp
@ -334,10 +334,10 @@ IF (NOT QT5_BUILD)
) )
ENDIF (NOT QT5_BUILD) ENDIF (NOT QT5_BUILD)
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# spatialindex headers produce warnings # spatialindex headers produce warnings
SET_SOURCE_FILES_PROPERTIES(qgsspatialindex.cpp PROPERTIES COMPILE_FLAGS -Wno-overloaded-virtual) SET_SOURCE_FILES_PROPERTIES(qgsspatialindex.cpp PROPERTIES COMPILE_FLAGS -Wno-overloaded-virtual)
ENDIF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
IF (WITH_INTERNAL_QEXTSERIALPORT) IF (WITH_INTERNAL_QEXTSERIALPORT)
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS} SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
@ -702,7 +702,7 @@ SET(QGIS_CORE_HDRS
layertree/qgslayertree.h layertree/qgslayertree.h
layertree/qgslayertreeutils.h layertree/qgslayertreeutils.h
geometry/qgsgeometry.h geometry/qgsgeometry.h
geometry/qgsabstractgeometryv2.h geometry/qgsabstractgeometryv2.h
geometry/qgswkbtypes.h geometry/qgswkbtypes.h

2
src/plugins/CMakeLists.txt
View File

@ -1,4 +1,4 @@
IF ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") IF (CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
ENDIF() ENDIF()
# override default path where built files are put to allow running qgis without installing # override default path where built files are put to allow running qgis without installing