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

depends on CMake >=2.6.2 and drop support for lenny (debian oldstable)

Browse Source
This commit is contained in:
Juergen E. Fischer 2011-08-29 11:41:39 +02:00
parent bcec848647
commit 7e6877010c
4 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -18,8 +18,8 @@ MESSAGE(STATUS "Quantum GIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS
############################################################# #############################################################
# CMake settings # CMake settings
# 2.6 required for QtWebkit # 2.6.2 required for VERSION_LESS
CMAKE_MINIMUM_REQUIRED(VERSION 2.6) CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
SET(CMAKE_COLOR_MAKEFILE ON) SET(CMAKE_COLOR_MAKEFILE ON)

4
cmake/FindQwt.cmake
View File

@ -33,9 +33,9 @@ ENDIF (QWT_INCLUDE_DIR AND QWT_LIBRARY)
IF (QWT_FOUND) IF (QWT_FOUND)
FILE(READ ${QWT_INCLUDE_DIR}/qwt_global.h qwt_header) FILE(READ ${QWT_INCLUDE_DIR}/qwt_global.h qwt_header)
STRING(REGEX REPLACE "^.*QWT_VERSION +(0x[0-9a-f]+).*$" "\\1" QWT_VERSION "${qwt_header}") STRING(REGEX REPLACE "^.*QWT_VERSION_STR +\"([^\"]+)\".*$" "\\1" QWT_VERSION_STR "${qwt_header}")
IF (NOT QWT_FIND_QUIETLY) IF (NOT QWT_FIND_QUIETLY)
MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY} (${QWT_VERSION})") MESSAGE(STATUS "Found Qwt: ${QWT_LIBRARY} (${QWT_VERSION_STR})")
ENDIF (NOT QWT_FIND_QUIETLY) ENDIF (NOT QWT_FIND_QUIETLY)
ELSE (QWT_FOUND) ELSE (QWT_FOUND)
IF (QWT_FIND_REQUIRED) IF (QWT_FIND_REQUIRED)

9
debian/rules vendored
View File

@ -10,7 +10,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p") DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze hardy intrepid jaunty karmic lucid maverick natty oneiric")) ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze hardy intrepid jaunty karmic lucid maverick natty oneiric"))
DISTRIBUTION := sid DISTRIBUTION := sid
endif endif
@ -123,11 +123,7 @@ clean: cleantemplates
install: build install: build
dh_testdir dh_testdir
dh_testroot dh_testroot
ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
dh_clean -k
else
dh_prep dh_prep
endif
dh_installdirs dh_installdirs
# Add here commands to install the package into debian/tmp. # Add here commands to install the package into debian/tmp.
@ -171,9 +167,6 @@ else
endif endif
dh_installmenu dh_installmenu
dh_icons dh_icons
ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
dh_desktop
endif
dh_installman -pqgis qgis.1 qbrowser.1 dh_installman -pqgis qgis.1 qbrowser.1
dh_installmime -pqgis dh_installmime -pqgis
dh_link dh_link

6
src/app/CMakeLists.txt
View File

@ -255,7 +255,7 @@ SET (QGIS_APP_MOC_HDRS
) )
IF(WITH_INTERNAL_QWTPOLAR) IF(WITH_INTERNAL_QWTPOLAR)
IF(QWT_VERSION LESS 393216) # <6.0.0 IF(QWT_VERSION_STR VERSION_LESS "6.0.0")
SET(QGIS_APP_SRCS SET(QGIS_APP_SRCS
${QGIS_APP_SRCS} ${QGIS_APP_SRCS}
gps/qwtpolar-0.1/qwt_polar_canvas.cpp gps/qwtpolar-0.1/qwt_polar_canvas.cpp
@ -282,7 +282,7 @@ IF(WITH_INTERNAL_QWTPOLAR)
) )
SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-0.1) SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-0.1)
ELSE(QWT_VERSION LESS 393216) ELSE(QWT_VERSION_STR VERSION_LESS "6.0.0")
SET(QGIS_APP_SRCS SET(QGIS_APP_SRCS
${QGIS_APP_SRCS} ${QGIS_APP_SRCS}
gps/qwtpolar-1.0/qwt_polar_canvas.cpp gps/qwtpolar-1.0/qwt_polar_canvas.cpp
@ -312,7 +312,7 @@ IF(WITH_INTERNAL_QWTPOLAR)
) )
SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-1.0) SET(QWTPOLAR_INCLUDE_DIR gps/qwtpolar-1.0)
ENDIF(QWT_VERSION LESS 393216) ENDIF(QWT_VERSION_STR VERSION_LESS "6.0.0")
SET(QWTPOLAR_LIBRARY "") SET(QWTPOLAR_LIBRARY "")
ENDIF(WITH_INTERNAL_QWTPOLAR) ENDIF(WITH_INTERNAL_QWTPOLAR)