Skip to content

Commit cd8ee51

Browse files
author
jef
committedApr 7, 2009
upgrade internal spatialite from beta to amalgamated 2.3.0 release
git-svn-id: http://svn.osgeo.org/qgis/trunk@10504 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 8d6af9e commit cd8ee51

30 files changed

+86002
-90386
lines changed
 

‎src/core/CMakeLists.txt

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -115,51 +115,14 @@ IF (WITH_INTERNAL_SPATIALITE)
115115
ENDIF (WIN32 OR APPLE)
116116
IF (WIN32)
117117
ADD_DEFINITIONS(-DDLL_EXPORT)
118-
IF (MSVC)
119-
ADD_DEFINITIONS("-DSQLITE_API=__declspec(dllexport)")
120-
ELSE (MSVC)
121-
ADD_DEFINITIONS("\"-DSQLITE_API=__declspec(dllexport)\"")
122-
ENDIF (MSVC)
123118
ENDIF (WIN32)
124119

125120
SET(QGIS_CORE_SRCS
126121
${QGIS_CORE_SRCS}
127-
spatialite/spatialite/mbrcache.c
128-
spatialite/spatialite/spatialite.c
129-
spatialite/spatialite/virtualfdo.c
130-
spatialite/spatialite/virtualnetwork.c
131-
spatialite/spatialite/virtualshape.c
132-
133-
spatialite/spatialite_c99/spatialite_c99.c
134-
135-
spatialite/gaiageo/gg_endian.c
136-
spatialite/gaiageo/gg_geometries.c
137-
spatialite/gaiageo/gg_advanced.c
138-
spatialite/gaiageo/gg_wkb.c
139-
spatialite/gaiageo/gg_wkt.c
140-
spatialite/gaiageo/gg_transform.c
141-
spatialite/gaiageo/gg_shape.c
142-
spatialite/gaiageo/gg_relations.c
143-
144-
spatialite/virtualtext/gaiaaux/gg_sqlaux.c
145-
spatialite/virtualtext/gaiaaux/gg_utf8.c
146-
147-
spatialite/virtualtext/sqlite3/sqlite3.c
148-
149-
spatialite/gaiaexif/gaia_exif.c
150-
151-
spatialite/virtualtext/virtualtext/virtualtext.c
152-
153-
spatialite/versioninfo/version.c
154-
122+
spatialite/sqlite3.c
123+
spatialite/spatialite.c
155124
)
156125

157-
IF (NOT MSVC)
158-
SET_SOURCE_FILES_PROPERTIES(
159-
spatialite/spatialite_c99/spatialite_c99.c
160-
PROPERTIES COMPILE_FLAGS -std=c99)
161-
ENDIF (NOT MSVC)
162-
163126
INCLUDE_DIRECTORIES(spatialite/headers)
164127
ENDIF (WITH_INTERNAL_SPATIALITE)
165128

@@ -299,6 +262,9 @@ IF (WITH_INTERNAL_SPATIALITE)
299262
IF (WIN32 OR APPLE)
300263
TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
301264
ENDIF (WIN32 OR APPLE)
265+
IF (UNIX)
266+
TARGET_LINK_LIBRARIES(qgis_core pthread)
267+
ENDIF (UNIX)
302268
ELSE (WITH_INTERNAL_SPATIALITE)
303269
TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
304270
ENDIF (WITH_INTERNAL_SPATIALITE)

0 commit comments

Comments
 (0)
Please sign in to comment.