Add support for grass8

manisandro · nyalldawson · commit e6072c937c04 · 2022-02-01T09:54:23.000+10:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -119,9 +119,8 @@ set (WITH_CORE TRUE CACHE BOOL "Determines whether QGIS core should be built.")
 mark_as_advanced(WITH_CORE)
 
 if(WITH_CORE)
-  # 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)
+  foreach (GRASS_SEARCH_VERSION 7 8)
     # 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
diff --git a/src/plugins/grass/8/CMakeLists.txt b/src/plugins/grass/8/CMakeLists.txt
@@ -0,0 +1,2 @@
+include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR})
+ADD_GRASSPLUGIN(8)
diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -251,7 +251,7 @@ if(NOT WIN32)
   install(DIRECTORY qtermwidget/color-schemes/ DESTINATION "${COLORSCHEMES_DIR}" FILES_MATCHING PATTERN "*.*schem*")
 endif()
 
-foreach(GRASS_BUILD_VERSION 6 7) # GRASS 6 and GRASS 7
+foreach(GRASS_BUILD_VERSION 6 7 8)
   if(GRASS_FOUND${GRASS_BUILD_VERSION})
     add_subdirectory(${GRASS_BUILD_VERSION})
   endif()
diff --git a/src/providers/CMakeLists.txt b/src/providers/CMakeLists.txt
@@ -40,7 +40,7 @@ if (NOT FORCE_STATIC_LIBS)
     add_subdirectory(pdal)
   endif()
 
-  if (WITH_GRASS OR WITH_GRASS7)
+  if (WITH_GRASS OR WITH_GRASS7 OR WITH_GRASS8)
     add_subdirectory(grass)
   endif()
 endif()
diff --git a/src/providers/grass/8/CMakeLists.txt b/src/providers/grass/8/CMakeLists.txt
@@ -0,0 +1,7 @@
+include_directories( SYSTEM
+  ${GRASS_INCLUDE_DIR8}
+)
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+ADD_GRASSLIB(8)
diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -319,7 +319,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)
     )
 endmacro(ADD_GRASSLIB)
 
-foreach(GRASS_BUILD_VERSION 6 7) # GRASS 6 and GRASS 7
+foreach(GRASS_BUILD_VERSION 6 7 8)
   if(GRASS_FOUND${GRASS_BUILD_VERSION})
     add_subdirectory(${GRASS_BUILD_VERSION})
   endif()
diff --git a/tests/src/providers/grass/8/CMakeLists.txt b/tests/src/providers/grass/8/CMakeLists.txt
@@ -0,0 +1,2 @@
+include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR})
+ADD_QGIS_GRASS_TESTS(8)
diff --git a/tests/src/providers/grass/CMakeLists.txt b/tests/src/providers/grass/CMakeLists.txt
@@ -86,8 +86,8 @@ macro (ADD_QGIS_GRASS_TESTS version)
   endif()
 endmacro (ADD_QGIS_GRASS_TESTS)
 
-foreach(GRASS_BUILD_VERSION 6 7)
+foreach(GRASS_BUILD_VERSION 6 7 8)
   if(GRASS_FOUND${GRASS_BUILD_VERSION})
     add_subdirectory(${GRASS_BUILD_VERSION})
   endif()
-endforeach(GRASS_BUILD_VERSION 6 7)
+endforeach(GRASS_BUILD_VERSION 6 7 8)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR})`
	`2`	`+ADD_GRASSPLUGIN(8)`
Original file line number	Diff line number	Diff line change
`@@ -319,7 +319,7 @@ macro(ADD_GRASSLIB GRASS_BUILD_VERSION)`
`319`	`319`	`)`
`320`	`320`	`endmacro(ADD_GRASSLIB)`
`321`	`321`
`322`		`-foreach(GRASS_BUILD_VERSION 6 7) # GRASS 6 and GRASS 7`
	`322`	`+foreach(GRASS_BUILD_VERSION 6 7 8)`
`323`	`323`	`if(GRASS_FOUND${GRASS_BUILD_VERSION})`
`324`	`324`	`add_subdirectory(${GRASS_BUILD_VERSION})`
`325`	`325`	`endif()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+include_directories(${GRASS_INCLUDE_DIR8} ${CMAKE_CURRENT_BINARY_DIR})`
	`2`	`+ADD_QGIS_GRASS_TESTS(8)`