Skip to content

Commit 4c436e5

Browse files
lbartoletti3nids
authored andcommitted
- Little modification to programmatically find grass version +Add
FreeBSD locale path - Add missing includes in kpty
1 parent 8d4d08f commit 4c436e5

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

cmake/FindGRASS.cmake

+5-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,11 @@ ENDIF (WIN32)
159159

160160
IF (UNIX)
161161
IF (GRASS_FIND_VERSION EQUAL 7)
162-
LIST(APPEND GRASS_PATHS /usr/lib64/grass70 /usr/lib/grass70 /usr/lib64/grass71 /usr/lib/grass71 /usr/lib64/grass72 /usr/lib/grass72)
162+
FOREACH (PATH /usr/lib64 /usr/lib /usr/local)
163+
FOREACH (VERSION grass70, grass71, grass72)
164+
LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
165+
ENDFOREACH (VERSION)
166+
ENDFOREACH (PATH)
163167
ENDIF ()
164168
ENDIF (UNIX)
165169

src/plugins/grass/qtermwidget/kpty.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828

2929

3030
#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
31+
#define HAVE_UTEMPTER
32+
#define HAVE_UTMPX
3133
#define HAVE_LOGIN
3234
#define HAVE_LIBUTIL_H
3335
#endif

0 commit comments

Comments
 (0)