Merge pull request #8743 from neteler/patch-76

Added grass76 support
qgis · Dec 27, 2018 · f33f238 · f33f238
2 parents 6ce09d8 + 45434a5
commit f33f238
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake
@@ -167,7 +167,7 @@ IF (UNIX)
         ENDFOREACH(VERSION_MINOR)
     ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
         FOREACH (PATH /usr/lib64 /usr/lib)
-            FOREACH (VERSION grass70, grass72, grass74)
+            FOREACH (VERSION grass76, grass74, grass72, grass70)
                 LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
             ENDFOREACH (VERSION)
         ENDFOREACH (PATH)
@@ -178,10 +178,10 @@ ENDIF (UNIX)
 IF (APPLE)
   IF (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.6.app/Contents/MacOS
       /Applications/GRASS-7.4.app/Contents/MacOS
+      /Applications/GRASS-7.2.app/Contents/MacOS
+      /Applications/GRASS-7.0.app/Contents/MacOS
     )
   ENDIF ()
   LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)