Skip to content
Permalink
Browse files

packaging: use WITH_GRASS to enable GRASS and WITH_GRASS$VERSION only…

… with the available version
  • Loading branch information
jef-n committed Sep 26, 2015
1 parent b46cbbe commit 614873169784cadf76621ae181d33d112ff688e3
Showing with 4 additions and 2 deletions.
  1. +1 −1 debian/rules
  2. +1 −0 ms-windows/osgeo4w/package-nightly.cmd
  3. +2 −1 ms-windows/osgeo4w/package.cmd
@@ -80,7 +80,7 @@ ifeq ($(GRASSVER),7)
else
CMAKE_OPTS += \
-DWITH_GRASS=TRUE \
-DWITH_GRASS7=FALSE \
-DWITH_GRASS6=TRUE \
-DGRASS_PREFIX=/usr/lib/$(GRASS)
endif

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

0 comments on commit 6148731

Please sign in to comment.
You can’t perform that action at this time.