sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-05 00:09:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

- Little modification to programmatically find grass version +Add

Browse Source 
FreeBSD locale path
- Add missing includes in kpty
This commit is contained in:
lbartoletti 2018-01-19 22:14:13 +01:00 committed by Denis Rouzaud
parent 8d4d08f8a0
commit 4c436e5d81
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/FindGRASS.cmake
View File

@ -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)

2
src/plugins/grass/qtermwidget/kpty.cpp
View File

@ -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