[QGIS Commit] r11431 - in trunk/qgis: . ms-windows/osgeo4w
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Tue Aug 18 17:32:21 EDT 2009
Author: jef
Date: 2009-08-18 17:32:20 -0400 (Tue, 18 Aug 2009)
New Revision: 11431
Modified:
trunk/qgis/CMakeLists.txt
trunk/qgis/ms-windows/osgeo4w/package.cmd
Log:
more osgeo4w tweaks
Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt 2009-08-18 20:55:29 UTC (rev 11430)
+++ trunk/qgis/CMakeLists.txt 2009-08-18 21:32:20 UTC (rev 11431)
@@ -187,7 +187,7 @@
# enable warnings
IF (PEDANTIC)
- MESSAGE ("-- Pedantic compiler settings enabled")
+ MESSAGE (STATUS "Pedantic compiler settings enabled")
IF(MSVC)
ADD_DEFINITIONS( /W4 )
@@ -204,10 +204,10 @@
ENDIF (MSVC)
ENDIF (PEDANTIC)
-IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
- MESSAGE ("-- Debug output enabled")
+IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+ MESSAGE (STATUS "Debug output enabled")
ADD_DEFINITIONS(-DQGISDEBUG=1)
-ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
+ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
#############################################################
# platform specific stuff
@@ -233,10 +233,10 @@
ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-D_CRT_NONSTDC_NO_WARNINGS)
- IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
- MESSAGE ("-- Generating browse files")
+ IF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
+ MESSAGE (STATUS "Generating browse files")
ADD_DEFINITIONS( /FR )
- ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_CONFIGURATION_TYPE MATCHES RelWithDebInfo)
+ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug OR CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
IF (INSTALL_DEPS)
INSTALL(DIRECTORY ${INSTALL_DEPS} DESTINATION .)
@@ -365,7 +365,7 @@
IF (HAVE_PYTHON AND WITH_BINDINGS)
SUBDIRS (python)
ELSE (HAVE_PYTHON AND WITH_BINDINGS)
- MESSAGE ("Python not being built")
+ MESSAGE (STATUS "Python not being built")
ENDIF (HAVE_PYTHON AND WITH_BINDINGS)
IF (ENABLE_TESTS)
Modified: trunk/qgis/ms-windows/osgeo4w/package.cmd
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/package.cmd 2009-08-18 20:55:29 UTC (rev 11430)
+++ trunk/qgis/ms-windows/osgeo4w/package.cmd 2009-08-18 21:32:20 UTC (rev 11431)
@@ -1,6 +1,13 @@
@echo off
set GRASS_VERSION=6.4.0svn
+set BUILDDIR=%CD%\build
+REM set BUILDDIR=%TEMP%\qgis_unstable
+set LOG=%BUILDDIR%\build.log
+
+if not exist "%BUILDDIR%" mkdir %BUILDDIR%
+if not exist "%BUILDDIR%" goto error
+
set VERSION=%1
set PACKAGE=%2
if "%VERSION%"=="" goto error
@@ -17,9 +24,6 @@
call "%OSGEO4W_ROOT%\bin\o4w_env.bat"
-set BUILDDIR=%CD%\build
-REM set BUILDDIR=%TEMP%\qgis_unstable
-
set O4W_ROOT=%OSGEO4W_ROOT:\=/%
set LIB_DIR=%O4W_ROOT%
@@ -33,8 +37,6 @@
set BUILDCONF=RelWithDebInfo
REM set BUILDCONF=Release
-if not exist "%BUILDDIR%" mkdir %BUILDDIR%
-if not exist "%BUILDDIR%" goto error
cd ..\..
set SRCDIR=%CD%
@@ -67,8 +69,6 @@
goto error
:build
-set LOG=%BUILDDIR%\build.log
-
echo Logging to %LOG%
echo BEGIN: %DATE% %TIME%>>%LOG% 2>&1
if errorlevel 1 goto error
@@ -81,11 +81,11 @@
if errorlevel 1 goto error
cmake -G "Visual Studio 9 2008" ^
- -D PEDANTIC=TRUE ^
- -D WITH_SPATIALITE=TRUE ^
- -D WITH_INTERNAL_SPATIALITE=TRUE ^
- -D CMAKE_CONFIGURATION_TYPE=%BUILDCONF% ^
- -D CMAKE_BUILDCONFIGURATION_TYPES=%BUILDCONF% ^
+ -D PEDANTIC=TRUE ^
+ -D WITH_SPATIALITE=TRUE ^
+ -D WITH_INTERNAL_SPATIALITE=TRUE ^
+ -D CMAKE_BUILD_TYPE=%BUILDCONF% ^
+ -D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
-D GDAL_INCLUDE_DIR=%O4W_ROOT%/apps/gdal-16/include ^
-D GDAL_LIBRARY=%O4W_ROOT%/apps/gdal-16/lib/gdal_i.lib ^
-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
More information about the QGIS-commit
mailing list