qgis · Jul 12, 2017
diff --git a/‎CMakeLists.txt
Lines changed: 8 additions & 11 deletions b/‎CMakeLists.txt
Lines changed: 8 additions & 11 deletions
diff --git a/‎cmake/FindGRASS.cmake
Lines changed: 2 additions & 15 deletions b/‎cmake/FindGRASS.cmake
Lines changed: 2 additions & 15 deletions
@@ -38,19 +38,16 @@ SET (WITH_CORE TRUE CACHE BOOL "Determines whether QGIS core should be built.")
 MARK_AS_ADVANCED(WITH_CORE)
 
 IF(WITH_CORE)
-  # try to configure and build GRASS plugin by default
-  FOREACH (GRASS_SEARCH_VERSION 6 7)
-    # For GRASS 6 are used cached variables without version suffix so that existing caches don't have to be reconfigured.
-    # Cached variables: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7
+  # Only GRASS 7 is currently supported but we keep dual version support in cmake for possible future switch to GRASS 8.
+  # Try to configure and build GRASS plugin by default
+  FOREACH (GRASS_SEARCH_VERSION 7)
+    # Legacy note:
+    # For GRASS 6 there were used cached variables without version suffix so that existing caches didn't have to be reconfigured.
+    # Cached variables were: WITH_GRASS, WITH_GRASS7, GRASS_PREFIX, GRASS_PREFIX7, GRASS_INCLUDE_DIR, GRASS_INCLUDE_DIR7
     # Everywhere else each variable has version major appended.
-    # Normal variables: GRASS_FOUND6, GRASS_FOUND7, GRASS_MAJOR_VERSION6, GRASS_MAJOR_VERSION7, etc.
+    # Normal variables were: GRASS_FOUND6, GRASS_FOUND7, GRASS_MAJOR_VERSION6, GRASS_MAJOR_VERSION7, etc.
     # In addition there is also GRASS_FOUND, which is TRUE if at least one version of GRASS was found
-    IF (GRASS_SEARCH_VERSION EQUAL 6)
-      SET (GRASS_CACHE_VERSION "")
-    ELSE (GRASS_SEARCH_VERSION EQUAL 6)
-      SET (GRASS_CACHE_VERSION ${GRASS_SEARCH_VERSION})
-    ENDIF (GRASS_SEARCH_VERSION EQUAL 6)
-
+    SET (GRASS_CACHE_VERSION ${GRASS_SEARCH_VERSION})
     SET (WITH_GRASS${GRASS_CACHE_VERSION} TRUE CACHE BOOL "Determines whether GRASS ${GRASS_SEARCH_VERSION} plugin should be built")
     IF (WITH_GRASS${GRASS_CACHE_VERSION})
       FIND_PACKAGE(GRASS ${GRASS_SEARCH_VERSION})
 
@@ -137,12 +137,6 @@ MACRO (CHECK_GRASS G_PREFIX)
           SET(GRASS_FOUND TRUE) # GRASS_FOUND is true if at least one version was found
           SET(GRASS_PREFIX${GRASS_CACHE_VERSION} ${G_PREFIX})
           CHECK_GRASS_EXTRA_INCLUDE_DIRS(${GRASS_FIND_VERSION})
-          IF(GRASS_FIND_VERSION EQUAL 6)
-            # Set also normal variable with number
-            SET(GRASS_INCLUDE_DIR${GRASS_FIND_VERSION} ${GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION}})
-            SET(GRASS_PREFIX${GRASS_FIND_VERSION} ${G_PREFIX})
-            CHECK_GRASS_EXTRA_INCLUDE_DIRS(${GRASS_FIND_VERSION})
-          ENDIF(GRASS_FIND_VERSION EQUAL 6)
         ENDIF(GRASS_LIBRARIES_FOUND${GRASS_FIND_VERSION})
     ENDIF(GRASS_MAJOR_VERSION${GRASS_FIND_VERSION} EQUAL GRASS_FIND_VERSION)
   ENDIF(GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION} AND EXISTS ${GRASS_INCLUDE_DIR${GRASS_CACHE_VERSION}}/grass/version.h)
@@ -164,20 +158,13 @@ IF (WIN32)
 ENDIF (WIN32)
 
 IF (UNIX)
-  IF (GRASS_FIND_VERSION EQUAL 6)
-    LIST(APPEND GRASS_PATHS /usr/lib64/grass64 /usr/lib/grass64)
-  ELSEIF (GRASS_FIND_VERSION EQUAL 7)
+  IF (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)
   ENDIF ()
 ENDIF (UNIX)
 
 IF (APPLE)
-  IF (GRASS_FIND_VERSION EQUAL 6)
-    LIST(APPEND GRASS_PATHS
-      /Applications/GRASS-6.3.app/Contents/MacOS
-      /Applications/GRASS-6.4.app/Contents/MacOS
-    )
-  ELSEIF (GRASS_FIND_VERSION EQUAL 7)
+  IF (GRASS_FIND_VERSION EQUAL 7)
     LIST(APPEND GRASS_PATHS
       /Applications/GRASS-7.0.app/Contents/MacOS
       /Applications/GRASS-7.1.app/Contents/MacOS