- Little modification to programmatically find grass version +Add

FreeBSD locale path - Add missing includes in kpty
mblesius · Jan 29, 2018 · 4c436e5 · 4c436e5
1 parent 8d4d08f
commit 4c436e5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/cmake/FindGRASS.cmake b/cmake/FindGRASS.cmake
@@ -159,7 +159,11 @@ ENDIF (WIN32)
 
 IF (UNIX)
   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)
+    FOREACH (PATH /usr/lib64 /usr/lib /usr/local)
+        FOREACH (VERSION grass70, grass71, grass72)
+            LIST(APPEND GRASS_PATHS "${PATH}/${VERSION}")
+        ENDFOREACH (VERSION)
+    ENDFOREACH (PATH)
   ENDIF ()
 ENDIF (UNIX)
 

diff --git a/src/plugins/grass/qtermwidget/kpty.cpp b/src/plugins/grass/qtermwidget/kpty.cpp
@@ -28,6 +28,8 @@
 
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#define HAVE_UTEMPTER
+#define HAVE_UTMPX
 #define HAVE_LOGIN
 #define HAVE_LIBUTIL_H
 #endif