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

packaging: use WITH_GRASS to enable GRASS and WITH_GRASS$VERSION only with the available version

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-09-26 21:27:52 +02:00
parent b46cbbe425
commit 6148731697
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/rules vendored
View File

@ -80,7 +80,7 @@ ifeq ($(GRASSVER),7)
else else
CMAKE_OPTS += \ CMAKE_OPTS += \
-DWITH_GRASS=TRUE \ -DWITH_GRASS=TRUE \
-DWITH_GRASS7=FALSE \ -DWITH_GRASS6=TRUE \
-DGRASS_PREFIX=/usr/lib/$(GRASS) -DGRASS_PREFIX=/usr/lib/$(GRASS)
endif endif

1
ms-windows/osgeo4w/package-nightly.cmd
View File

@ -66,6 +66,7 @@ set CMAKE_OPT=^
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^ -D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^ -D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^
-D WITH_GRASS=TRUE ^ -D WITH_GRASS=TRUE ^
-D WITH_GRASS6=TRUE ^
-D WITH_GRASS7=TRUE ^ -D WITH_GRASS7=TRUE ^
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.4 ^ -D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.4 ^
-D GRASS_PREFIX7=%O4W_ROOT%/apps/grass/grass-7.0.1 ^ -D GRASS_PREFIX7=%O4W_ROOT%/apps/grass/grass-7.0.1 ^

3
ms-windows/osgeo4w/package.cmd
View File

@ -66,6 +66,7 @@ set CMAKE_OPT=^
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^ -D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^ -D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^
-D WITH_GRASS=TRUE ^ -D WITH_GRASS=TRUE ^
-D WITH_GRASS6=TRUE ^
-D WITH_GRASS7=TRUE ^ -D WITH_GRASS7=TRUE ^
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.4 ^ -D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.4 ^
-D GRASS_PREFIX7=%O4W_ROOT%/apps/grass/grass-7.0.1 -D GRASS_PREFIX7=%O4W_ROOT%/apps/grass/grass-7.0.1
@ -85,7 +86,7 @@ set CMAKE_OPT=^
-G "Visual Studio 10 Win64" ^ -G "Visual Studio 10 Win64" ^
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^ -D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
-D WITH_GRASS=TRUE ^ -D WITH_GRASS=TRUE ^
-D WITH_GRASS7=FALSE ^ -D WITH_GRASS6=TRUE ^
-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.3 ^ -D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-6.4.3 ^
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^ -D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^ -D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^