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

Add grass74 support

Browse Source 
GRASS GIS 7.4 is the current stable version, support added
This commit is contained in:
Markus Neteler 2018-02-20 12:30:24 +01:00 committed by GitHub
parent 713bfd3452
commit 2dece58b67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/FindGRASS.cmake
View File

@ -160,14 +160,14 @@ ENDIF (WIN32)
IF (UNIX) IF (UNIX)
IF (GRASS_FIND_VERSION EQUAL 7) IF (GRASS_FIND_VERSION EQUAL 7)
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
FOREACH (VERSION_MINOR 0 1 2 3 4) FOREACH (VERSION_MINOR 0 1 2 3 4 5 6)
FOREACH (VERSION_BUILD 0 1 2 3 4 5) FOREACH (VERSION_BUILD 0 1 2 3 4 5 6)
LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD}) LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD})
ENDFOREACH (VERSION_BUILD) ENDFOREACH (VERSION_BUILD)
ENDFOREACH(VERSION_MINOR) ENDFOREACH(VERSION_MINOR)
ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
FOREACH (PATH /usr/lib64 /usr/lib) FOREACH (PATH /usr/lib64 /usr/lib)
FOREACH (VERSION grass70, grass71, grass72) FOREACH (VERSION grass70, grass72, grass74)
LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}") LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
ENDFOREACH (VERSION) ENDFOREACH (VERSION)
ENDFOREACH (PATH) ENDFOREACH (PATH)
@ -181,6 +181,7 @@ IF (APPLE)
/Applications/GRASS-7.0.app/Contents/MacOS /Applications/GRASS-7.0.app/Contents/MacOS
/Applications/GRASS-7.1.app/Contents/MacOS /Applications/GRASS-7.1.app/Contents/MacOS
/Applications/GRASS-7.2.app/Contents/MacOS /Applications/GRASS-7.2.app/Contents/MacOS
/Applications/GRASS-7.4.app/Contents/MacOS
) )
ENDIF () ENDIF ()
LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources) LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)