95 lines
2.6 KiB
Diff
95 lines
2.6 KiB
Diff
--- qgis-1.0.0/debian/rules 2008-12-28 16:54:12.000000000 +0100
|
|
+++ qgis-1.0.0_new/debian/rules 2008-12-28 17:17:46.000000000 +0100
|
|
@@ -18,7 +18,8 @@
|
|
-D CMAKE_INSTALL_PREFIX=/usr \
|
|
-D CMAKE_SKIP_RPATH=TRUE \
|
|
-D BINDINGS_GLOBAL_INSTALL=TRUE \
|
|
- -D PEDANTIC=TRUE
|
|
+ -D PEDANTIC=TRUE \
|
|
+ -D WITH_INTERNAL_SQLITE3=TRUE
|
|
|
|
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
|
|
CFLAGS += -O0
|
|
--- qgis-1.0.0/src/app/CMakeLists.txt 2008-12-28 16:54:17.000000000 +0100
|
|
+++ qgis-1.0.0_new/src/app/CMakeLists.txt 2008-12-28 17:19:38.000000000 +0100
|
|
@@ -188,11 +188,16 @@
|
|
../plugins
|
|
../python
|
|
${PROJ_INCLUDE_DIR}
|
|
- ${SQLITE3_INCLUDE_DIR}
|
|
${GEOS_INCLUDE_DIR}
|
|
${GDAL_INCLUDE_DIR}
|
|
)
|
|
|
|
+IF(WITH_INTERNAL_SQLITE3)
|
|
+ INCLUDE_DIRECTORIES(../core/sqlite3)
|
|
+ELSE(WITH_INTERNAL_SQLITE3)
|
|
+ INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
|
|
+ENDIF(WITH_INTERNAL_SQLITE3)
|
|
+
|
|
IF (POSTGRES_FOUND)
|
|
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
|
|
ENDIF (POSTGRES_FOUND)
|
|
--- qgis-1.0.0/src/gui/CMakeLists.txt 2008-12-28 16:54:44.000000000 +0100
|
|
+++ qgis-1.0.0_new/src/gui/CMakeLists.txt 2008-12-28 17:20:38.000000000 +0100
|
|
@@ -85,10 +85,15 @@
|
|
${QT_QTSVG_LIBRARY}
|
|
${QT_QTNETWORK_LIBRARY}
|
|
${QT_QTMAIN_LIBRARY}
|
|
- ${SQLITE3_LIBRARIES}
|
|
qgis_core
|
|
)
|
|
|
|
+IF (WITH_INTERNAL_SQLITE3)
|
|
+ TARGET_LINK_LIBRARIES(qgis_gui
|
|
+ ${SQLITE3_LIBRARIES}
|
|
+ )
|
|
+ENDIF(WITH_INTERNAL_SQLITE3)
|
|
+
|
|
INSTALL(TARGETS qgis_gui
|
|
RUNTIME DESTINATION ${QGIS_BIN_DIR}
|
|
LIBRARY DESTINATION ${QGIS_LIB_DIR}
|
|
--- qgis-1.0.0/src/helpviewer/CMakeLists.txt 2008-12-28 16:54:51.000000000 +0100
|
|
+++ qgis-1.0.0_new/src/helpviewer/CMakeLists.txt 2008-12-28 17:23:23.000000000 +0100
|
|
@@ -6,10 +6,15 @@
|
|
main.cpp
|
|
qgshelpserver.cpp
|
|
qgshelpviewer.cpp
|
|
- #../core/qgsapplication.cpp
|
|
- #../core/qgslogger.cpp
|
|
)
|
|
|
|
+IF(WITH_INTERNAL_SQLITE3)
|
|
+ SET(HELP_SRCS
|
|
+ ${HELP_SRCS}
|
|
+ ${CMAKE_CURRENT_SOURCE_DIR}/../core/sqlite3/sqlite3.c
|
|
+ )
|
|
+ENDIF(WITH_INTERNAL_SQLITE3)
|
|
+
|
|
SET (HELP_UIS qgshelpviewerbase.ui)
|
|
|
|
SET (HELP_MOC_HDRS
|
|
@@ -34,13 +39,20 @@
|
|
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
|
${CMAKE_CURRENT_SOURCE_DIR}/../core
|
|
${CMAKE_CURRENT_BINARY_DIR}
|
|
- ${SQLITE3_INCLUDE_DIR}
|
|
)
|
|
|
|
+IF(WITH_INTERNAL_SQLITE3)
|
|
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../core/sqlite3)
|
|
+ENDIF(WITH_INTERNAL_SQLITE3)
|
|
+
|
|
TARGET_LINK_LIBRARIES(qgis_help
|
|
- ${SQLITE3_LIBRARY}
|
|
qgis_core
|
|
)
|
|
+
|
|
+IF(NOT WITH_INTERNAL_SQLITE3)
|
|
+ TARGET_LINK_LIBRARIES(qgis_help ${SQLITE3_LIBRARY})
|
|
+ENDIF(NOT WITH_INTERNAL_SQLITE3)
|
|
+
|
|
IF (${QTVERSION} STRLESS "4.3.0")
|
|
TARGET_LINK_LIBRARIES(qgis_help
|
|
${QT_LIBRARIES}
|