Skip to content

Commit

Permalink
Add grass74 support
Browse files Browse the repository at this point in the history
GRASS GIS 7.4 is the current stable version, support added
  • Loading branch information
neteler committed Feb 20, 2018
1 parent 713bfd3 commit 2dece58
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions cmake/FindGRASS.cmake
Expand Up @@ -160,14 +160,14 @@ ENDIF (WIN32)
IF (UNIX)
IF (GRASS_FIND_VERSION EQUAL 7)
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
FOREACH (VERSION_MINOR 0 1 2 3 4)
FOREACH (VERSION_BUILD 0 1 2 3 4 5)
FOREACH (VERSION_MINOR 0 1 2 3 4 5 6)
FOREACH (VERSION_BUILD 0 1 2 3 4 5 6)
LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD})
ENDFOREACH (VERSION_BUILD)
ENDFOREACH(VERSION_MINOR)
ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
FOREACH (PATH /usr/lib64 /usr/lib)
FOREACH (VERSION grass70, grass71, grass72)
FOREACH (VERSION grass70, grass72, grass74)
LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
ENDFOREACH (VERSION)
ENDFOREACH (PATH)
Expand All @@ -181,6 +181,7 @@ IF (APPLE)
/Applications/GRASS-7.0.app/Contents/MacOS
/Applications/GRASS-7.1.app/Contents/MacOS
/Applications/GRASS-7.2.app/Contents/MacOS
/Applications/GRASS-7.4.app/Contents/MacOS
)
ENDIF ()
LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)
Expand Down

0 comments on commit 2dece58

Please sign in to comment.