Skip to content
Permalink
Browse files

Merge pull request #6394 from neteler/patch-75

Add grass74 support
  • Loading branch information
jef-n committed Feb 20, 2018
2 parents 348b0cf + 2dece58 commit 4eef948bc3e192296cb3b166950de31681323ba9
Showing with 4 additions and 3 deletions.
  1. +4 −3 cmake/FindGRASS.cmake
@@ -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)
@@ -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)

0 comments on commit 4eef948

Please sign in to comment.
You can’t perform that action at this time.