Add GRASS74 support (backported from 2dece58)

qgis · Feb 21, 2018 · 9c2a0f8 · 9c2a0f8
1 parent c8ed4c1
commit 9c2a0f8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake
@@ -137,7 +137,7 @@ IF (UNIX)
   IF (GRASS_FIND_VERSION EQUAL 6)
     LIST(APPEND GRASS_PATHS /usr/lib64/grass64 /usr/lib/grass64)
   ELSEIF (GRASS_FIND_VERSION EQUAL 7)
-    LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass71 /usr/lib/grass71 /usr/lib64/grass72 /usr/lib/grass72)
+    LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass72 /usr/lib/grass72 /usr/lib64/grass74 /usr/lib/grass74)
   ENDIF ()
 ENDIF (UNIX)
 
@@ -150,8 +150,8 @@ IF (APPLE)
   ELSEIF (GRASS_FIND_VERSION EQUAL 7)
     LIST(APPEND GRASS_PATHS
       /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)