Skip to content
Permalink
Browse files

more osgeo4w tweaks

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11431 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef
jef committed Aug 18, 2009
1 parent 6210636 commit 5c21d27c315d72323fa77ce0ffbf3535f9c74709
Showing with 20 additions and 20 deletions.
  1. +8 −8 CMakeLists.txt
  2. +12 −12 ms-windows/osgeo4w/package.cmd
@@ -187,7 +187,7 @@ FIND_PROGRAM(QT_LRELEASE_EXECUTABLE
# enable warnings

IF (PEDANTIC)
MESSAGE ("-- Pedantic compiler settings enabled")
MESSAGE (STATUS "Pedantic compiler settings enabled")
IF(MSVC)
ADD_DEFINITIONS( /W4 )

@@ -204,10 +204,10 @@ IF (PEDANTIC)
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 @@ IF (WIN32)
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 @@ SUBDIRS(src doc images resources i18n)
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)
@@ -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 @@ if not exist "%OSGEO4W_ROOT%\bin\o4w_env.bat" goto error

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 @@ PROMPT qgis%VERSION%$g
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 @@ if exist build.tmp del build.tmp
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 @@ echo CMAKE: %DATE% %TIME%>>%LOG% 2>&1
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 ^

0 comments on commit 5c21d27

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