Skip to content

Commit 018086e

Browse files
jef-njef-n
committedApr 18, 2014
GRASS:
* don't include unistd on windows in browser * avoid warning when grass/version.h is not found at once
1 parent 66be005 commit 018086e

File tree

2 files changed

+47
-46
lines changed

2 files changed

+47
-46
lines changed
 

‎cmake/FindGRASS.cmake

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,52 +10,52 @@ MACRO (CHECK_GRASS G_PREFIX)
1010

1111
FIND_PATH (GRASS_INCLUDE_DIR grass/version.h ${G_PREFIX}/include)
1212

13-
FILE(READ ${GRASS_INCLUDE_DIR}/grass/version.h VERSIONFILE)
14-
# We can avoid the following block using version_less version_equal and
15-
# version_greater. Are there compatibility problems?
16-
STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[^ ]+" GRASS_VERSION ${VERSIONFILE})
17-
STRING(REGEX REPLACE "^([0-9]*)\\.[0-9]*\\..*$" "\\1" GRASS_MAJOR_VERSION ${GRASS_VERSION})
18-
STRING(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\..*$" "\\1" GRASS_MINOR_VERSION ${GRASS_VERSION})
19-
STRING(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.(.*)$" "\\1" GRASS_MICRO_VERSION ${GRASS_VERSION})
20-
# Add micro version too?
21-
# How to numerize RC versions?
22-
MATH( EXPR GRASS_NUM_VERSION "${GRASS_MAJOR_VERSION}*10000 + ${GRASS_MINOR_VERSION}*100")
23-
24-
SET (GRASS_LIBRARIES_FOUND TRUE)
25-
SET (GRASS_LIB_NAMES gis dig2 dbmiclient dbmibase shape dgl rtree datetime linkm gproj)
26-
IF (GRASS_MAJOR_VERSION LESS 7 )
27-
LIST(APPEND GRASS_LIB_NAMES vect)
28-
LIST(APPEND GRASS_LIB_NAMES form)
29-
ELSE (GRASS_MAJOR_VERSION LESS 7 )
30-
LIST(APPEND GRASS_LIB_NAMES vector)
31-
LIST(APPEND GRASS_LIB_NAMES raster)
32-
ENDIF (GRASS_MAJOR_VERSION LESS 7 )
33-
34-
FOREACH (LIB ${GRASS_LIB_NAMES})
35-
MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
36-
37-
SET(LIB_PATH NOTFOUND)
38-
FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH)
39-
40-
IF (LIB_PATH)
41-
SET (GRASS_LIBRARY_${LIB} ${LIB_PATH})
42-
ELSE (LIB_PATH)
43-
SET (GRASS_LIBRARY_${LIB} NOTFOUND)
44-
SET (GRASS_LIBRARIES_FOUND FALSE)
45-
ENDIF (LIB_PATH)
46-
47-
ENDFOREACH (LIB)
48-
49-
# LIB_PATH is only temporary variable, so hide it (is it possible to delete a variable?)
50-
UNSET(LIB_PATH CACHE)
51-
52-
IF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES_FOUND)
53-
SET (GRASS_FOUND TRUE)
54-
SET (GRASS_PREFIX ${G_PREFIX})
55-
ENDIF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES_FOUND)
56-
57-
MARK_AS_ADVANCED ( GRASS_INCLUDE_DIR )
13+
IF(GRASS_INCLUDE_DIR)
14+
FILE(READ ${GRASS_INCLUDE_DIR}/grass/version.h VERSIONFILE)
15+
# We can avoid the following block using version_less version_equal and
16+
# version_greater. Are there compatibility problems?
17+
STRING(REGEX MATCH "[0-9]+\\.[0-9]+\\.[^ ]+" GRASS_VERSION ${VERSIONFILE})
18+
STRING(REGEX REPLACE "^([0-9]*)\\.[0-9]*\\..*$" "\\1" GRASS_MAJOR_VERSION ${GRASS_VERSION})
19+
STRING(REGEX REPLACE "^[0-9]*\\.([0-9]*)\\..*$" "\\1" GRASS_MINOR_VERSION ${GRASS_VERSION})
20+
STRING(REGEX REPLACE "^[0-9]*\\.[0-9]*\\.(.*)$" "\\1" GRASS_MICRO_VERSION ${GRASS_VERSION})
21+
# Add micro version too?
22+
# How to numerize RC versions?
23+
MATH( EXPR GRASS_NUM_VERSION "${GRASS_MAJOR_VERSION}*10000 + ${GRASS_MINOR_VERSION}*100")
24+
25+
SET (GRASS_LIBRARIES_FOUND TRUE)
26+
SET (GRASS_LIB_NAMES gis dig2 dbmiclient dbmibase shape dgl rtree datetime linkm gproj)
27+
IF (GRASS_MAJOR_VERSION LESS 7 )
28+
LIST(APPEND GRASS_LIB_NAMES vect)
29+
LIST(APPEND GRASS_LIB_NAMES form)
30+
ELSE (GRASS_MAJOR_VERSION LESS 7 )
31+
LIST(APPEND GRASS_LIB_NAMES vector)
32+
LIST(APPEND GRASS_LIB_NAMES raster)
33+
ENDIF (GRASS_MAJOR_VERSION LESS 7 )
34+
35+
FOREACH (LIB ${GRASS_LIB_NAMES})
36+
MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
37+
38+
SET(LIB_PATH NOTFOUND)
39+
FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH)
40+
41+
IF (LIB_PATH)
42+
SET (GRASS_LIBRARY_${LIB} ${LIB_PATH})
43+
ELSE (LIB_PATH)
44+
SET (GRASS_LIBRARY_${LIB} NOTFOUND)
45+
SET (GRASS_LIBRARIES_FOUND FALSE)
46+
ENDIF (LIB_PATH)
47+
ENDFOREACH (LIB)
48+
49+
# LIB_PATH is only temporary variable, so hide it (is it possible to delete a variable?)
50+
UNSET(LIB_PATH CACHE)
51+
52+
IF (GRASS_LIBRARIES_FOUND)
53+
SET (GRASS_FOUND TRUE)
54+
SET (GRASS_PREFIX ${G_PREFIX})
55+
ENDIF (GRASS_LIBRARIES_FOUND)
56+
ENDIF( GRASS_INCLUDE_DIR )
5857

58+
MARK_AS_ADVANCED ( GRASS_INCLUDE_DIR )
5959
ENDMACRO (CHECK_GRASS)
6060

6161
###################################

‎src/plugins/grass/qgis.g.browser.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,15 @@
1414
***************************************************************************/
1515
#include <stdlib.h>
1616
#include <stdio.h>
17-
#include <unistd.h>
1817
#include <iostream>
1918
#include <QUrl>
2019
#include <QDesktopServices>
2120
#include <QString>
2221

2322
#ifdef Q_OS_WIN
2423
#include <windows.h>
24+
#else
25+
#include <unistd.h>
2526
#endif
2627

2728
// Open a URL by default browser

0 commit comments

Comments
 (0)