Skip to content

Commit

Permalink
upgrade internal spatialite from beta to amalgamated 2.3.0 release
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@10504 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 7, 2009
1 parent 83f07f3 commit 06aa595
Show file tree
Hide file tree
Showing 30 changed files with 86,002 additions and 90,386 deletions.
44 changes: 5 additions & 39 deletions src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,51 +115,14 @@ IF (WITH_INTERNAL_SPATIALITE)
ENDIF (WIN32 OR APPLE)
IF (WIN32)
ADD_DEFINITIONS(-DDLL_EXPORT)
IF (MSVC)
ADD_DEFINITIONS("-DSQLITE_API=__declspec(dllexport)")
ELSE (MSVC)
ADD_DEFINITIONS("\"-DSQLITE_API=__declspec(dllexport)\"")
ENDIF (MSVC)
ENDIF (WIN32)

SET(QGIS_CORE_SRCS
${QGIS_CORE_SRCS}
spatialite/spatialite/mbrcache.c
spatialite/spatialite/spatialite.c
spatialite/spatialite/virtualfdo.c
spatialite/spatialite/virtualnetwork.c
spatialite/spatialite/virtualshape.c

spatialite/spatialite_c99/spatialite_c99.c

spatialite/gaiageo/gg_endian.c
spatialite/gaiageo/gg_geometries.c
spatialite/gaiageo/gg_advanced.c
spatialite/gaiageo/gg_wkb.c
spatialite/gaiageo/gg_wkt.c
spatialite/gaiageo/gg_transform.c
spatialite/gaiageo/gg_shape.c
spatialite/gaiageo/gg_relations.c

spatialite/virtualtext/gaiaaux/gg_sqlaux.c
spatialite/virtualtext/gaiaaux/gg_utf8.c

spatialite/virtualtext/sqlite3/sqlite3.c

spatialite/gaiaexif/gaia_exif.c

spatialite/virtualtext/virtualtext/virtualtext.c

spatialite/versioninfo/version.c

spatialite/sqlite3.c
spatialite/spatialite.c
)

IF (NOT MSVC)
SET_SOURCE_FILES_PROPERTIES(
spatialite/spatialite_c99/spatialite_c99.c
PROPERTIES COMPILE_FLAGS -std=c99)
ENDIF (NOT MSVC)

INCLUDE_DIRECTORIES(spatialite/headers)
ENDIF (WITH_INTERNAL_SPATIALITE)

Expand Down Expand Up @@ -299,6 +262,9 @@ IF (WITH_INTERNAL_SPATIALITE)
IF (WIN32 OR APPLE)
TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
ENDIF (WIN32 OR APPLE)
IF (UNIX)
TARGET_LINK_LIBRARIES(qgis_core pthread)
ENDIF (UNIX)
ELSE (WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
ENDIF (WITH_INTERNAL_SPATIALITE)
Expand Down

0 comments on commit 06aa595

Please sign in to comment.