Skip to content

Commit 841af77

Browse files
jef-njef-n
committed
remove (outdated) internal spatialite
1 parent 41da5c3 commit 841af77

34 files changed

+59
-300120
lines changed

‎CMakeLists.txt

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,7 @@ SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
7070

7171
SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport")
7272

73-
SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
7473
SET (WITH_QSPATIALITE FALSE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
75-
IF(WITH_INTERNAL_SPATIALITE)
76-
SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
77-
IF(WIN32 OR APPLE OR CYGWIN)
78-
FIND_PACKAGE(Iconv REQUIRED)
79-
ENDIF(WIN32 OR APPLE OR CYGWIN)
80-
ENDIF (WITH_INTERNAL_SPATIALITE)
8174

8275
SET (WITH_ORACLE FALSE CACHE BOOL "Determines whether Oracle support should be built")
8376
IF(WITH_ORACLE)
@@ -200,21 +193,17 @@ ELSE (WITH_INTERNAL_QEXTSERIALPORT)
200193
FIND_PACKAGE(Qextserialport REQUIRED)
201194
ENDIF(WITH_INTERNAL_QEXTSERIALPORT)
202195

203-
IF (NOT WITH_INTERNAL_SPATIALITE)
204-
FIND_PACKAGE(Sqlite3)
205-
IF (NOT SQLITE3_FOUND)
206-
MESSAGE (SEND_ERROR "sqlite3 dependency was not found (try compiling with internal spatialite)!")
207-
ENDIF (NOT SQLITE3_FOUND)
208-
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
196+
FIND_PACKAGE(Sqlite3)
197+
IF (NOT SQLITE3_FOUND)
198+
MESSAGE (SEND_ERROR "sqlite3 dependency was not found!")
199+
ENDIF (NOT SQLITE3_FOUND)
209200

210201
# optional
211202
IF (WITH_POSTGRESQL)
212203
FIND_PACKAGE(Postgres) # PostgreSQL provider, SPIT plugin
213204
ENDIF (WITH_POSTGRESQL)
214205

215-
IF (NOT WITH_INTERNAL_SPATIALITE)
216-
FIND_PACKAGE(SPATIALITE REQUIRED)
217-
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
206+
FIND_PACKAGE(SPATIALITE REQUIRED)
218207

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

‎INSTALL

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Monday November 24, 2014
3+
Tuesday December 30, 2014
44

55

6-
Last Updated: Monday November 24, 2014
6+
Last Updated: Tuesday December 30, 2014
77
Last Change : Monday November 24, 2014
88

99

@@ -1748,7 +1748,7 @@ Leopard and Snow Leopard, but was dropped at Lion. To build the Mapserver
17481748
component on Leopard and Snow, add the following line before the last line in
17491749
the above configuration:
17501750

1751-
-D WITH_MAPSERVER=TRUE \
1751+
-D WITH_SERVER=TRUE \
17521752

17531753
On Lion you are on your own to figure out how to install libfcgi and add fcgi
17541754
support to the system Apache. Not recommended for the average user.

‎NEWS

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
QGIS News
22
Change history for the QGIS Project
3-
Thursday November 13, 2014
3+
Tuesday December 30, 2014
44

55

66
------------------------------------------------------------------------
@@ -34,8 +34,8 @@ Thursday November 13, 2014
3434
------------------------------------------------------------------------
3535

3636

37-
Last Updated: Thursday November 13, 2014
38-
Last Change : Thursday November 13, 2014
37+
Last Updated: Tuesday December 30, 2014
38+
Last Change : Monday December 01, 2014
3939

4040

4141
1. What's new in Version 2.6.0 'Brighton'?

‎doc/INSTALL.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Monday November 24, 2014</H3>
80+
<H3>Tuesday December 30, 2014</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Monday November 24, 2014
85+
Last Updated: Tuesday December 30, 2014
8686
Last Change : Monday November 24, 2014
8787
</P>
8888
<DIV CLASS="toc">
@@ -2424,7 +2424,7 @@ <H2>5.7. Configure the build</H2>
24242424
</P>
24252425

24262426
<div class="code"><PRE>
2427-
-D WITH_MAPSERVER=TRUE \
2427+
-D WITH_SERVER=TRUE \
24282428
</PRE></div>
24292429

24302430
<P>

‎doc/news.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS News</H1>
7979
<H2>Change history for the QGIS Project</H2>
80-
<H3>Thursday November 13, 2014</H3>
80+
<H3>Tuesday December 30, 2014</H3>
8181
</DIV>
8282

8383
<DIV CLASS="toc">
@@ -111,8 +111,8 @@ <H3>Thursday November 13, 2014</H3>
111111
</DIV>
112112
<DIV CLASS="body" ID="body">
113113
<P>
114-
Last Updated: Thursday November 13, 2014
115-
Last Change : Thursday November 13, 2014
114+
Last Updated: Tuesday December 30, 2014
115+
Last Change : Monday December 01, 2014
116116
</P>
117117

118118
<A NAME="toc1"></A>

‎doc/osx.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ mkdir build
812812
cd build
813813
cmake -D CMAKE_INSTALL_PREFIX=~/Applications \
814814
-D CMAKE_BUILD_TYPE=MINSIZEREL -D ENABLE_TESTS=FALSE \
815-
-D WITH_INTERNAL_SPATIALITE=FALSE -D WITH_PYSPATIALITE=FALSE \
815+
-D WITH_PYSPATIALITE=FALSE \
816816
-D SPATIALINDEX_LIBRARY=/usr/local/lib/libspatialindex.dylib \
817817
-D SPATIALINDEX_INCLUDE_DIR=/usr/local/include/spatialindex \
818818
-D QWT_LIBRARY=/usr/local/qwt-6.0.2/lib/libqwt.dylib \

‎ms-windows/cygwin/package.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ cd build
88
cmake -D BUILDNAME="cygwin" \
99
-D SITE="qgis.org" \
1010
-D PEDANTIC=TRUE \
11-
-D WITH_INTERNAL_SPATIALITE=TRUE \
1211
-D WITH_GRASS=FALSE \
1312
-D WITH_SPATIALITE=TRUE \
1413
-D WITH_QSPATIALITE=TRUE \

‎python/CMakeLists.txt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
SET(PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
22

3-
IF (WITH_INTERNAL_SPATIALITE)
4-
INCLUDE_DIRECTORIES(
5-
../src/core/spatialite/headers
6-
../src/core/spatialite/headers/spatialite
7-
)
8-
ENDIF (WITH_INTERNAL_SPATIALITE)
9-
103
SET (QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)
114
FILE (MAKE_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
125
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})

‎python/ext-libs/pyspatialite/CMakeLists.txt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite)
22
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite)
33

4-
IF(WITH_INTERNAL_SPATIALITE)
5-
INCLUDE_DIRECTORIES(
6-
../../src/core/spatialite/headers
7-
../../src/core/spatialite/headers/spatialite
8-
)
9-
ENDIF(WITH_INTERNAL_SPATIALITE)
10-
114
INCLUDE_DIRECTORIES(
125
${PYTHON_INCLUDE_PATH}
136
${GEOS_INCLUDE_DIR}
@@ -44,11 +37,7 @@ IF (NOT APPLE)
4437
TARGET_LINK_LIBRARIES(pyspatialite ${PYTHON_LIBRARY})
4538
ENDIF (NOT APPLE)
4639

47-
TARGET_LINK_LIBRARIES(pyspatialite qgis_core)
48-
49-
IF(NOT WITH_INTERNAL_SPATIALITE)
50-
TARGET_LINK_LIBRARIES(pyspatialite ${SPATIALITE_LIBRARY})
51-
ENDIF(NOT WITH_INTERNAL_SPATIALITE)
40+
TARGET_LINK_LIBRARIES(pyspatialite qgis_core ${SPATIALITE_LIBRARY})
5241

5342
IF (APPLE)
5443
SET_TARGET_PROPERTIES(pyspatialite PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")

‎scripts/addcopyright.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ for i in $FILES; do
4141
author=volayaf
4242
;;
4343

44-
src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/astyle/*|python/pyspatialite/*)
44+
src/app/gps/qwtpolar-*|src/app/qtmain_android.cpp|src/core/gps/qextserialport/*|src/astyle/*|python/pyspatialite/*)
4545
# Skip third party files
4646
echo $f skipped
4747
continue

‎scripts/astyle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ $ARTISTIC_STYLE_OPTIONS \
6060

6161
for f in "$@"; do
6262
case "$f" in
63-
src/app/gps/qwtpolar-*|src/core/spatialite/*|src/core/spatialindex/src/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/ext-libs/*|src/providers/spatialite/qspatialite/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
63+
src/app/gps/qwtpolar-*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/ext-libs/*|src/providers/spatialite/qspatialite/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
6464
echo -ne "$f skipped $elcr"
6565
continue
6666
;;

‎scripts/chkcopyrights.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616

1717

1818
licensecheck -r . |
19-
egrep -v "\/debian\/|.\/src\/plugins\/dxf2shp_converter\/dxflib|.\/src\/core\/spatialite\/|\.\/ms-windows\/osgeo4w\/untgz\/|\.\/src\/app\/gps\/qwtpolar-0.1|\.\/src\/app\/gps\/qwtpolar-1.0|: BSD \(3 clause\)|: GPL \(v[23] or later\)$|: LGPL \(v2 or later\)$|: MIT\/X11 \(BSD like\)$|: Apache \(v2\.0\) GPL \(v2 or later\)$|: LGPL$|: Apache \(v2\.0\)$|: zlib\/libpng$|: GPL LGPL$|GENERATED FILE" |
19+
egrep -v "\/debian\/|.\/src\/plugins\/dxf2shp_converter\/dxflib|\.\/ms-windows\/osgeo4w\/untgz\/|\.\/src\/app\/gps\/qwtpolar-0.1|\.\/src\/app\/gps\/qwtpolar-1.0|: BSD \(3 clause\)|: GPL \(v[23] or later\)$|: LGPL \(v2 or later\)$|: MIT\/X11 \(BSD like\)$|: Apache \(v2\.0\) GPL \(v2 or later\)$|: LGPL$|: Apache \(v2\.0\)$|: zlib\/libpng$|: GPL LGPL$|GENERATED FILE" |
2020
sed -e "s/:.*$//"

‎scripts/prepare-commit.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ASTYLEDIFF=astyle.$REV.diff
6666
# reformat
6767
for f in $MODIFIED; do
6868
case "$f" in
69-
src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
69+
src/core/gps/qextserialport/*|src/plugins/dxf2shp_converter/dxflib/src/*|src/plugins/globe/osgEarthQt/*|src/plugins/globe/osgEarthUtil/*)
7070
echo $f skipped
7171
continue
7272
;;

‎scripts/update-indent.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ ASTYLEDIFF=astyle.r$REV0-r$REV1.diff
5757
# reformat
5858
for f in $MODIFIED; do
5959
case "$f" in
60-
src/core/spatialite/*|src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*)
60+
src/core/gps/qextserialport/*|src/plugins/grass/qtermwidget/*|src/astyle/*|python/pyspatialite/*)
6161
echo $f skipped
6262
continue
6363
;;

‎src/analysis/CMakeLists.txt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SUBDIRS( network )
1+
SUBDIRS(network)
22

33
#############################################################
44
# sources
@@ -52,16 +52,12 @@ SET(QGIS_ANALYSIS_MOC_HDRS
5252
openstreetmap/qgsosmimport.h
5353
)
5454

55-
IF (WITH_INTERNAL_SPATIALITE)
56-
INCLUDE_DIRECTORIES(../core/spatialite/headers)
57-
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
58-
ELSE (WITH_INTERNAL_SPATIALITE)
59-
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
60-
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
61-
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
62-
ENDIF (WITH_INTERNAL_SPATIALITE)
63-
55+
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
56+
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
6457
INCLUDE_DIRECTORIES(BEFORE raster)
58+
59+
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
60+
6561
ADD_FLEX_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalclexer.ll)
6662

6763
ADD_BISON_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalcparser.yy)

‎src/app/CMakeLists.txt

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -458,14 +458,9 @@ IF (ANDROID)
458458
INCLUDE_DIRECTORIES(${ANDROID_NDK_TOOLCHAIN_ROOT}/sysroot/usr/include)
459459
ENDIF (ANDROID)
460460

461-
IF (WITH_INTERNAL_SPATIALITE)
462-
INCLUDE_DIRECTORIES(../core/spatialite/headers)
463-
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
464-
ELSE (WITH_INTERNAL_SPATIALITE)
465-
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
466-
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
467-
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
468-
ENDIF (WITH_INTERNAL_SPATIALITE)
461+
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
462+
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
463+
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
469464

470465
INCLUDE_DIRECTORIES(
471466
${PROJ_INCLUDE_DIR}

‎src/browser/CMakeLists.txt

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,19 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
6767
${GDAL_INCLUDE_DIR} # remove once raster layer is cleaned up
6868
)
6969

70-
IF (WITH_INTERNAL_SPATIALITE)
71-
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
72-
ELSE (WITH_INTERNAL_SPATIALITE)
73-
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
74-
ENDIF (WITH_INTERNAL_SPATIALITE)
75-
76-
TARGET_LINK_LIBRARIES(qbrowser qgis_core qgis_gui)
77-
78-
IF (NOT WITH_INTERNAL_SPATIALITE)
79-
TARGET_LINK_LIBRARIES(qbrowser ${SQLITE3_LIBRARY})
80-
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
70+
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
8171

8272
TARGET_LINK_LIBRARIES(qbrowser
73+
qgis_core
74+
qgis_gui
8375
${QT_QTCORE_LIBRARY}
8476
${QT_QTGUI_LIBRARY}
8577
${QT_QTNETWORK_LIBRARY}
8678
${QT_QTSVG_LIBRARY}
8779
${QT_QTXML_LIBRARY}
8880
${QT_QTWEBKIT_LIBRARY}
8981
${QT_QTMAIN_LIBRARY}
82+
${SQLITE3_LIBRARY}
9083
)
9184

9285
IF(APPLE)

‎src/core/CMakeLists.txt

Lines changed: 5 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -323,39 +323,7 @@ IF (QT_MOBILITY_LOCATION_FOUND)
323323
)
324324
ENDIF (QT_MOBILITY_LOCATION_FOUND)
325325

326-
IF (WITH_INTERNAL_SPATIALITE)
327-
IF (WIN32 OR APPLE OR ANDROID OR CYGWIN)
328-
INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
329-
ENDIF (WIN32 OR APPLE OR ANDROID OR CYGWIN)
330-
IF (WIN32)
331-
ADD_DEFINITIONS(-DDLL_EXPORT)
332-
ENDIF (WIN32)
333-
334-
#
335-
# sqlite3 requires some extraflags to be defined
336-
# in order to support:
337-
# - huge database > 2 GB
338-
# - RTree Spatial Index
339-
#
340-
ADD_DEFINITIONS(-D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1)
341-
ADD_DEFINITIONS(-DSQLITE_ENABLE_RTREE=1)
342-
343-
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
344-
spatialite/sqlite3.c
345-
spatialite/spatialite.c
346-
)
347-
348-
IF(MSVC)
349-
# dirty code
350-
SET_SOURCE_FILES_PROPERTIES(spatialite/sqlite3.c spatialite/spatialite.c PROPERTIES COMPILE_FLAGS /W0)
351-
ELSE(MSVC)
352-
SET_SOURCE_FILES_PROPERTIES(spatialite/sqlite3.c spatialite/spatialite.c PROPERTIES COMPILE_FLAGS -w)
353-
ENDIF(MSVC)
354-
355-
INCLUDE_DIRECTORIES(BEFORE spatialite/headers/spatialite spatialite/headers)
356-
ELSE (WITH_INTERNAL_SPATIALITE)
357-
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
358-
ENDIF (WITH_INTERNAL_SPATIALITE)
326+
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
359327

360328
ADD_FLEX_FILES(QGIS_CORE_SRCS qgsexpressionlexer.ll)
361329

@@ -718,12 +686,10 @@ INCLUDE_DIRECTORIES(
718686
${GEOS_INCLUDE_DIR}
719687
${GDAL_INCLUDE_DIR}
720688
${EXPAT_INCLUDE_DIR}
689+
${SQLITE3_INCLUDE_DIR}
690+
${SPATIALITE_INCLUDE_DIR}
721691
)
722692

723-
IF (NOT WITH_INTERNAL_SPATIALITE)
724-
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
725-
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
726-
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
727693

728694
IF (WIN32)
729695
IF (MSVC)
@@ -812,22 +778,10 @@ TARGET_LINK_LIBRARIES(qgis_core
812778
${GDAL_LIBRARY}
813779
${SPATIALINDEX_LIBRARY}
814780
${EXPAT_LIBRARY}
781+
${SQLITE3_LIBRARY}
782+
${SPATIALITE_LIBRARY}
815783
)
816784
817-
IF (WITH_INTERNAL_SPATIALITE)
818-
IF (WIN32 OR APPLE OR CYGWIN)
819-
TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
820-
ENDIF (WIN32 OR APPLE OR CYGWIN)
821-
IF (ANDROID)
822-
TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY} ${CHARSET_LIBRARY})
823-
ENDIF (ANDROID)
824-
IF (UNIX AND NOT ANDROID)
825-
TARGET_LINK_LIBRARIES(qgis_core pthread ${CMAKE_DL_LIBS})
826-
ENDIF (UNIX AND NOT ANDROID)
827-
ELSE (WITH_INTERNAL_SPATIALITE)
828-
TARGET_LINK_LIBRARIES(qgis_core ${SQLITE3_LIBRARY} ${SPATIALITE_LIBRARY})
829-
ENDIF (WITH_INTERNAL_SPATIALITE)
830-
831785
# install
832786
833787
INSTALL(TARGETS qgis_core

0 commit comments

Comments
 (0)