[QGIS Commit] r10480 - in trunk/qgis: . src/app src/core src/gui
src/helpviewer
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sun Apr 5 15:06:54 EDT 2009
Author: jef
Date: 2009-04-05 15:06:54 -0400 (Sun, 05 Apr 2009)
New Revision: 10480
Removed:
trunk/qgis/src/core/sqlite3/
Modified:
trunk/qgis/CMakeLists.txt
trunk/qgis/src/app/CMakeLists.txt
trunk/qgis/src/core/CMakeLists.txt
trunk/qgis/src/gui/CMakeLists.txt
trunk/qgis/src/helpviewer/CMakeLists.txt
Log:
internal sqlite3 was replaced with spatialite
Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt 2009-04-05 17:56:00 UTC (rev 10479)
+++ trunk/qgis/CMakeLists.txt 2009-04-05 19:06:54 UTC (rev 10480)
@@ -73,9 +73,6 @@
SET (BINDINGS_GLOBAL_INSTALL FALSE CACHE BOOL "Install bindings to global python directory? (might need root)")
ENDIF (WITH_BINDINGS)
-# Optionally allow embedding sqlite3 into the binary (sqlite amalgamation) as
-# recommended by sqlite developer
-SET (WITH_INTERNAL_SQLITE3 FALSE CACHE BOOL "Compile sqlite3 support directly into the binary")
# Compile flag. Make it posible to turn it off.
SET (PEDANTIC FALSE CACHE BOOL "Determines if we should compile in pedantic mode.")
@@ -111,27 +108,26 @@
# required
FIND_PACKAGE(Proj)
+FIND_PACKAGE(Expat) # GPS importer plugin
+FIND_PACKAGE(GSL) # Georeferencer
+FIND_PACKAGE(GEOS)
+FIND_PACKAGE(GDAL)
-#optional since we can use internal sqlite
-IF (NOT WITH_INTERNAL_SQLITE3)
+IF (NOT WITH_INTERNAL_SPATIALITE)
FIND_PACKAGE(Sqlite3)
IF (NOT SQLITE3_FOUND)
- MESSAGE (SEND_ERROR "sqlite3 dependency was not found (try compiling with sqlite3 internal)!")
+ MESSAGE (SEND_ERROR "sqlite3 dependency was not found (try compiling with internal spatialite)!")
ENDIF (NOT SQLITE3_FOUND)
-ENDIF (NOT WITH_INTERNAL_SQLITE3)
+ENDIF (NOT WITH_INTERNAL_SPATIALITE)
-FIND_PACKAGE(GEOS)
-FIND_PACKAGE(GDAL)
-
# optional
IF (WITH_POSTGRESQL)
FIND_PACKAGE(Postgres) # PostgreSQL provider, SPIT plugin
ENDIF (WITH_POSTGRESQL)
-FIND_PACKAGE(Expat) # GPS importer plugin
-FIND_PACKAGE(GSL) # Georeferencer
IF (WITH_GRASS)
FIND_PACKAGE(GRASS) # GRASS plugin
ENDIF (WITH_GRASS)
+
IF (WITH_SPATIALITE AND NOT WITH_INTERNAL_SPATIALITE)
FIND_PACKAGE(SPATIALITE)
ENDIF (WITH_SPATIALITE AND NOT WITH_INTERNAL_SPATIALITE)
@@ -143,7 +139,6 @@
INCLUDE (Python) # file cmake/Python.cmake
ENDIF (WITH_BINDINGS)
-
IF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
MESSAGE (SEND_ERROR "Some dependencies were not found!")
ENDIF (NOT PROJ_FOUND OR NOT GEOS_FOUND OR NOT GDAL_FOUND)
Modified: trunk/qgis/src/app/CMakeLists.txt
===================================================================
--- trunk/qgis/src/app/CMakeLists.txt 2009-04-05 17:56:00 UTC (rev 10479)
+++ trunk/qgis/src/app/CMakeLists.txt 2009-04-05 19:06:54 UTC (rev 10480)
@@ -218,8 +218,6 @@
ENDIF (MSVC)
ENDIF (WIN32)
-
-
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR} composer legend attributetable
${CMAKE_CURRENT_BINARY_DIR}
@@ -230,11 +228,16 @@
../plugins
../python
${PROJ_INCLUDE_DIR}
- ${SQLITE3_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)
+IF (WITH_INTERNAL_SPATIALITE)
+ INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
+ELSE (WITH_INTERNAL_SPATIALITE)
+ INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
+ENDIF (WITH_INTERNAL_SPATIALITE)
+
IF (POSTGRES_FOUND)
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
ENDIF (POSTGRES_FOUND)
@@ -268,9 +271,11 @@
qgis_core
qgis_gui
)
-IF(NOT WITH_INTERNAL_SQLITE AND NOT WITH_INTERNAL_SPATIALITE)
+
+IF(NOT WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis ${SQLITE_LIBRARY})
-ENDIF(NOT WITH_INTERNAL_SQLITE AND NOT WITH_INTERNAL_SPATIALITE)
+ENDIF(NOT WITH_INTERNAL_SPATIALITE)
+
IF (${QTVERSION} STRLESS "4.3.0")
TARGET_LINK_LIBRARIES(qgis ${QT_QT3SUPPORT_LIBRARY} )
ENDIF (${QTVERSION} STRLESS "4.3.0")
Modified: trunk/qgis/src/core/CMakeLists.txt
===================================================================
--- trunk/qgis/src/core/CMakeLists.txt 2009-04-05 17:56:00 UTC (rev 10479)
+++ trunk/qgis/src/core/CMakeLists.txt 2009-04-05 19:06:54 UTC (rev 10480)
@@ -89,12 +89,6 @@
spatialindex/qgsspatialindex.cpp
)
-IF (WITH_INTERNAL_SQLITE3)
- SET(QGIS_CORE_SRCS
- ${QGIS_CORE_SRCS}
- sqlite3/sqlite3.c
- )
-ENDIF (WITH_INTERNAL_SQLITE3)
IF (WITH_INTERNAL_SPATIALITE)
IF (WIN32)
@@ -202,11 +196,10 @@
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)
-IF (WITH_INTERNAL_SQLITE3)
- INCLUDE_DIRECTORIES(sqlite3)
-ELSE (WITH_INTERNAL_SQLITE3)
+
+IF (NOT WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
-ENDIF (WITH_INTERNAL_SQLITE3)
+ENDIF (NOT WITH_INTERNAL_SPATIALITE)
IF (WIN32)
IF (MSVC)
@@ -277,12 +270,10 @@
IF (WIN32)
TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
ENDIF (WIN32)
+ELSE (WITH_INTERNAL_SPATIALITE)
+ TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
ENDIF (WITH_INTERNAL_SPATIALITE)
-IF (NOT WITH_INTERNAL_SQLITE3)
- TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY})
-ENDIF (NOT WITH_INTERNAL_SQLITE3)
-
INSTALL(TARGETS qgis_core
RUNTIME DESTINATION ${QGIS_BIN_DIR}
LIBRARY DESTINATION ${QGIS_LIB_DIR}
Modified: trunk/qgis/src/gui/CMakeLists.txt
===================================================================
--- trunk/qgis/src/gui/CMakeLists.txt 2009-04-05 17:56:00 UTC (rev 10479)
+++ trunk/qgis/src/gui/CMakeLists.txt 2009-04-05 19:06:54 UTC (rev 10480)
@@ -51,11 +51,11 @@
${CMAKE_CURRENT_BINARY_DIR}/../ui
${GEOS_INCLUDE_DIR}
)
-IF (WITH_INTERNAL_SQLITE3)
- INCLUDE_DIRECTORIES(../core/sqlite3)
-ELSE (WITH_INTERNAL_SQLITE3)
+IF (WITH_INTERNAL_SPATIALITE)
+ INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
+ELSE (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
-ENDIF (WITH_INTERNAL_SQLITE3)
+ENDIF (WITH_INTERNAL_SPATIALITE)
IF (WIN32)
IF (MSVC)
@@ -85,10 +85,13 @@
${QT_QTSVG_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTMAIN_LIBRARY}
- ${SQLITE3_LIBRARIES}
qgis_core
)
+IF (NOT WITH_INTERNAL_SPATIALITE)
+ TARGET_LINK_LIBRARIES(qgis_gui ${SQLITE3_LIBRARIES})
+ENDIF (NOT WITH_INTERNAL_SPATIALITE)
+
INSTALL(TARGETS qgis_gui
RUNTIME DESTINATION ${QGIS_BIN_DIR}
LIBRARY DESTINATION ${QGIS_LIB_DIR}
Modified: trunk/qgis/src/helpviewer/CMakeLists.txt
===================================================================
--- trunk/qgis/src/helpviewer/CMakeLists.txt 2009-04-05 17:56:00 UTC (rev 10479)
+++ trunk/qgis/src/helpviewer/CMakeLists.txt 2009-04-05 19:06:54 UTC (rev 10480)
@@ -1,66 +1,73 @@
-
-########################################################
-# Files
-
-SET (HELP_SRCS
- main.cpp
- qgshelpserver.cpp
- qgshelpviewer.cpp
- #../core/qgsapplication.cpp
- #../core/qgslogger.cpp
-)
-
-SET (HELP_UIS qgshelpviewerbase.ui)
-
-SET (HELP_MOC_HDRS
- qgshelpserver.h
- qgshelpviewer.h
-)
-
-#SET (HELP_RCCS qgsgps_plugin.qrc)
-
-
-########################################################
-# Build
-
-QT4_WRAP_UI (HELP_UIS_H ${HELP_UIS})
-
-QT4_WRAP_CPP (HELP_MOC_SRCS ${HELP_MOC_HDRS})
-
-#QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
-
-ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
-
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/../core
- ${CMAKE_CURRENT_BINARY_DIR}
- ${SQLITE3_INCLUDE_DIR}
-)
-
-TARGET_LINK_LIBRARIES(qgis_help
- ${SQLITE3_LIBRARY}
- qgis_core
-)
-IF (${QTVERSION} STRLESS "4.3.0")
- TARGET_LINK_LIBRARIES(qgis_help
- ${QT_LIBRARIES}
- )
-ELSE (${QTVERSION} STRLESS "4.3.0")
- TARGET_LINK_LIBRARIES(qgis_help
- ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${QT_QTNETWORK_LIBRARY}
- ${QT_QTSVG_LIBRARY}
- ${QT_QTXML_LIBRARY}
- )
-ENDIF (${QTVERSION} STRLESS "4.3.0")
-
-
-########################################################
-# Install
-
-IF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
- INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
-ELSE (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
- INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
-ENDIF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
+
+########################################################
+# Files
+
+SET (HELP_SRCS
+ main.cpp
+ qgshelpserver.cpp
+ qgshelpviewer.cpp
+ #../core/qgsapplication.cpp
+ #../core/qgslogger.cpp
+)
+
+SET (HELP_UIS qgshelpviewerbase.ui)
+
+SET (HELP_MOC_HDRS
+ qgshelpserver.h
+ qgshelpviewer.h
+)
+
+#SET (HELP_RCCS qgsgps_plugin.qrc)
+
+
+########################################################
+# Build
+
+QT4_WRAP_UI (HELP_UIS_H ${HELP_UIS})
+
+QT4_WRAP_CPP (HELP_MOC_SRCS ${HELP_MOC_HDRS})
+
+#QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
+
+ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
+
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/../core
+ ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+IF (WITH_INTERNAL_SPATIALITE)
+ INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
+ELSE (WITH_INTERNAL_SPATIALITE)
+ INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
+ENDIF (WITH_INTERNAL_SPATIALITE)
+
+TARGET_LINK_LIBRARIES(qgis_help qgis_core)
+
+IF (NOT WITH_INTERNAL_SPATIALITE)
+ TARGET_LINK_LIBRARIES(qgis_help ${SQLITE3_LIBRARY})
+ENDIF (NOT WITH_INTERNAL_SPATIALITE)
+
+IF (${QTVERSION} STRLESS "4.3.0")
+ TARGET_LINK_LIBRARIES(qgis_help
+ ${QT_LIBRARIES}
+ )
+ELSE (${QTVERSION} STRLESS "4.3.0")
+ TARGET_LINK_LIBRARIES(qgis_help
+ ${QT_QTCORE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ ${QT_QTNETWORK_LIBRARY}
+ ${QT_QTSVG_LIBRARY}
+ ${QT_QTXML_LIBRARY}
+ )
+ENDIF (${QTVERSION} STRLESS "4.3.0")
+
+
+########################################################
+# Install
+
+IF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
+ INSTALL (TARGETS qgis_help BUNDLE DESTINATION ${QGIS_BIN_DIR})
+ELSE (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
+ INSTALL (TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
+ENDIF (APPLE AND NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS "2.6")
More information about the QGIS-commit
mailing list