Skip to content

Commit 9a01c53

Browse files
ccrookccrook
committedApr 12, 2013
Merge branch 'master' into delimiter_text_enhancement
·
ltr-3_40archive/master_2
2 parents 920253d + a290fa2 commit 9a01c53

File tree

752 files changed

+14456
-30091
lines changed

Some content is hidden

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

752 files changed

+14456
-30091
lines changed
 

‎CMakeLists.txt

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,16 @@ SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
5757

5858
SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport")
5959

60-
SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")
61-
IF (WITH_SPATIALITE)
62-
SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
63-
SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
64-
SET (WITH_QSPATIALITE FALSE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
65-
IF(WITH_INTERNAL_SPATIALITE)
66-
SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
67-
SET(HAVE_SPATIALITE TRUE)
68-
IF(WIN32 OR APPLE)
69-
FIND_PACKAGE(Iconv REQUIRED)
70-
ENDIF(WIN32 OR APPLE)
71-
ENDIF (WITH_INTERNAL_SPATIALITE)
72-
ENDIF (WITH_SPATIALITE)
60+
SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
61+
SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
62+
SET (WITH_QSPATIALITE FALSE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
63+
IF(WITH_INTERNAL_SPATIALITE)
64+
SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
65+
SET(HAVE_SPATIALITE TRUE)
66+
IF(WIN32 OR APPLE OR CYGWIN)
67+
FIND_PACKAGE(Iconv REQUIRED)
68+
ENDIF(WIN32 OR APPLE OR CYGWIN)
69+
ENDIF (WITH_INTERNAL_SPATIALITE)
7370

7471
SET (WITH_ORACLE FALSE CACHE BOOL "Determines whether Oracle support should be built")
7572
IF(WITH_ORACLE)
@@ -198,9 +195,9 @@ IF (WITH_POSTGRESQL)
198195
FIND_PACKAGE(Postgres) # PostgreSQL provider, SPIT plugin
199196
ENDIF (WITH_POSTGRESQL)
200197

201-
IF (WITH_SPATIALITE AND NOT WITH_INTERNAL_SPATIALITE)
198+
IF (NOT WITH_INTERNAL_SPATIALITE)
202199
FIND_PACKAGE(SPATIALITE)
203-
ENDIF (WITH_SPATIALITE AND NOT WITH_INTERNAL_SPATIALITE)
200+
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
204201

205202
IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
206203
MESSAGE (SEND_ERROR "Some dependencies were not found!")

‎Doxyfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -670,8 +670,6 @@ INPUT = doc \
670670
src/core/diagram \
671671
src/core/composer \
672672
src/core/raster \
673-
src/core/renderer \
674-
src/core/symbology \
675673
src/core/symbology-ng \
676674
src/core/gps \
677675
src/gui \

0 commit comments

Comments
 (0)
Please sign in to comment.