Skip to content

Commit 2ef1772

Browse files
timlinuxtimlinux
committedOct 14, 2011
Merge branch 'master' of github.com:qgis/Quantum-GIS
·
ltr-3_40Before-merge-new_vector_api
2 parents 8154103 + f8ed801 commit 2ef1772

File tree

125 files changed

+6524
-6316
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

125 files changed

+6524
-6316
lines changed
 

‎BUGS

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Help I think I found a bug!
33

44
If you find a bug in QGIS, you can report it using the QGIS ticket/bug database at:
55

6-
http://trac.osgeo.org/qgis/report
6+
http://hub.qgis.org/projects/quantum-gis/issues/new
77

88

99
Some hints about when you should file a bug:
@@ -25,6 +25,3 @@ Some hints about when you should file a bug:
2525
do. While we appreciate it's inconvenient if some issue prevents you doing
2626
your work, we need to take the big picture view of things and focus on
2727
things that affect the largest proportion of our user base.
28-
29-
30-
$Id$

‎CMakeLists.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ IF (WITH_POSTGRESQL)
5151
SET (POSTGRESQL_PREFIX "" CACHE PATH "Path to POSTGRESQL base directory")
5252
ENDIF (WITH_POSTGRESQL)
5353

54-
SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal built of QwtPolar")
54+
SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
55+
56+
SET (WITH_INTERNAL_SPATIALINDEX TRUE CACHE BOOL "Use internal build of Spatialindex")
5557

5658
SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")
5759

@@ -136,6 +138,11 @@ FIND_PACKAGE(Expat) # GPS importer plugin
136138
FIND_PACKAGE(GSL) # Georeferencer
137139
FIND_PACKAGE(GEOS)
138140
FIND_PACKAGE(GDAL)
141+
142+
IF (NOT WITH_INTERNAL_SPATIALINDEX)
143+
FIND_PACKAGE(Spatialindex REQUIRED)
144+
ENDIF(NOT WITH_INTERNAL_SPATIALINDEX)
145+
139146
FIND_PACKAGE(Qwt REQUIRED)
140147
IF (NOT WITH_INTERNAL_QWTPOLAR)
141148
FIND_PACKAGE(QwtPolar REQUIRED)
@@ -219,9 +226,10 @@ IF (PEDANTIC)
219226
ADD_DEFINITIONS( /wd4610 ) # user defined constructor required (sqlite3_index_info)
220227
ADD_DEFINITIONS( /wd4706 ) # assignment within conditional expression (pal)
221228
ELSE (MSVC)
222-
ADD_DEFINITIONS( -Wall -Wextra -Wredundant-decls -Wno-long-long -Wformat-security -Wno-strict-aliasing )
229+
ADD_DEFINITIONS( -Wall -Wextra -Wno-long-long -Wformat-security -Wno-strict-aliasing )
223230
# Qt produces lots of warnings with strict aliasing (as of Qt 4.4.0 & GCC 4.3)
224-
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 )
231+
# There are redundant declarations in Qt and GDAL
232+
# ADD_DEFINITIONS( -fstrict-aliasing -Wstrict-aliasing=1 -Wredundant-decls )
225233
ENDIF (MSVC)
226234
ENDIF (PEDANTIC)
227235

0 commit comments

Comments
 (0)
Please sign in to comment.