Skip to content
Permalink
Browse files

osgeo4w: reflect packagename and version in nightly build

(cherry-picked from 9c5cbd4, dec0ca5 and 51a7317)
  • Loading branch information
jef-n committed Apr 26, 2015
1 parent 9e0893f commit 6ada2b61cf52f5e0ef21013c9de45a8f00a2caef
Showing with 1 addition and 2 deletions.
  1. +1 −2 ms-windows/osgeo4w/package-nightly.cmd
@@ -56,7 +56,6 @@ path %path%;%PF86%\Microsoft Visual Studio 10.0\VC\bin

set CMAKE_OPT=^
-G "Visual Studio 10" ^
-D BUILDNAME="OSGeo4W-Nightly-VC10-32" ^
-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt.lib ^
-D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MD /ZI /MP /Od /D NDEBUG /D QGISDEBUG" ^
@@ -75,7 +74,6 @@ if not exist "%SETUPAPI_LIBRARY%" (echo SETUPAPI_LIBRARY not found & goto error)

set CMAKE_OPT=^
-G "Visual Studio 10 Win64" ^
-D BUILDNAME="OSGeo4W-Nightly-VC10-64" ^
-D SPATIALINDEX_LIBRARY=%O4W_ROOT%/lib/spatialindex-64.lib ^
-D SIP_BINARY_PATH=%O4W_ROOT%/bin/sip.exe ^
-D QWT_LIBRARY=%O4W_ROOT%/lib/qwt5.lib ^
@@ -142,6 +140,7 @@ set GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION%

cmake %CMAKE_OPT% ^
-D SITE="qgis.org" ^
-D BUILDNAME="%PACKAGENAME%-%VERSION%-Nightly-VC10-%ARCH%" ^
-D PEDANTIC=TRUE ^
-D WITH_QSPATIALITE=TRUE ^
-D WITH_SERVER=TRUE ^

0 comments on commit 6ada2b6

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