Skip to content

Commit 4eef948

Browse files
authored
Merge pull request #6394 from neteler/patch-75
Add grass74 support
2 parents 348b0cf + 2dece58 commit 4eef948

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

cmake/FindGRASS.cmake

+4-3
Original file line numberDiff line numberDiff line change
@@ -160,14 +160,14 @@ ENDIF (WIN32)
160160
IF (UNIX)
161161
IF (GRASS_FIND_VERSION EQUAL 7)
162162
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
163-
FOREACH (VERSION_MINOR 0 1 2 3 4)
164-
FOREACH (VERSION_BUILD 0 1 2 3 4 5)
163+
FOREACH (VERSION_MINOR 0 1 2 3 4 5 6)
164+
FOREACH (VERSION_BUILD 0 1 2 3 4 5 6)
165165
LIST (APPEND GRASS_PATHS /usr/local/grass-${GRASS_FIND_VERSION}.${VERSION_MINOR}.${VERSION_BUILD})
166166
ENDFOREACH (VERSION_BUILD)
167167
ENDFOREACH(VERSION_MINOR)
168168
ELSE (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
169169
FOREACH (PATH /usr/lib64 /usr/lib)
170-
FOREACH (VERSION grass70, grass71, grass72)
170+
FOREACH (VERSION grass70, grass72, grass74)
171171
LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
172172
ENDFOREACH (VERSION)
173173
ENDFOREACH (PATH)
@@ -181,6 +181,7 @@ IF (APPLE)
181181
/Applications/GRASS-7.0.app/Contents/MacOS
182182
/Applications/GRASS-7.1.app/Contents/MacOS
183183
/Applications/GRASS-7.2.app/Contents/MacOS
184+
/Applications/GRASS-7.4.app/Contents/MacOS
184185
)
185186
ENDIF ()
186187
LIST(APPEND GRASS_PATHS /Applications/GRASS.app/Contents/Resources)

0 commit comments

Comments
 (0)