Skip to content

Commit dcef083

Browse files
jef-njef-n
committedNov 3, 2012
apply revised #6613
·
ltr-3_40Before-merge-new_vector_api
1 parent 35646bb commit dcef083

File tree

5 files changed

+91
-75
lines changed

5 files changed

+91
-75
lines changed
 

‎CMakeLists.txt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ ENDIF (WITH_POSTGRESQL)
5555

5656
SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
5757

58+
SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport")
59+
5860
SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")
5961
IF (WITH_SPATIALITE)
6062
SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
@@ -157,12 +159,18 @@ FIND_PACKAGE(GEOS)
157159
FIND_PACKAGE(GDAL)
158160
FIND_PACKAGE(Expat)
159161
FIND_PACKAGE(Spatialindex REQUIRED)
160-
161162
FIND_PACKAGE(Qwt REQUIRED)
163+
162164
IF (NOT WITH_INTERNAL_QWTPOLAR)
163165
FIND_PACKAGE(QwtPolar REQUIRED)
164166
ENDIF(NOT WITH_INTERNAL_QWTPOLAR)
165167

168+
IF (WITH_INTERNAL_QEXTSERIALPORT)
169+
SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)
170+
ELSE (WITH_INTERNAL_QEXTSERIALPORT)
171+
FIND_PACKAGE(Qextserialport REQUIRED)
172+
ENDIF(WITH_INTERNAL_QEXTSERIALPORT)
173+
166174
IF (NOT WITH_INTERNAL_SPATIALITE)
167175
FIND_PACKAGE(Sqlite3)
168176
IF (NOT SQLITE3_FOUND)

‎python/CMakeLists.txt

Lines changed: 43 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -20,32 +20,32 @@ SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
2020
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
2121

2222
INCLUDE_DIRECTORIES(
23-
${PYTHON_INCLUDE_PATH}
24-
${SIP_INCLUDE_DIR}
25-
${QT_QTCORE_INCLUDE_DIR}
26-
${QT_QTGUI_INCLUDE_DIR}
27-
${QT_QTNETWORK_INCLUDE_DIR}
28-
${QT_QTSVG_INCLUDE_DIR}
29-
${QT_QTXML_INCLUDE_DIR}
30-
${GDAL_INCLUDE_DIR}
31-
${GEOS_INCLUDE_DIR}
32-
${QWT_INCLUDE_DIR}
33-
34-
../src/core
35-
../src/core/pal
36-
../src/core/composer
37-
../src/core/diagram
38-
../src/core/gps
39-
../src/core/gps/qextserialport
40-
../src/core/raster
41-
../src/core/renderer
42-
../src/core/symbology
43-
../src/core/symbology-ng
44-
45-
../src/gui/raster
46-
../src/gui/attributetable
47-
48-
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
23+
${PYTHON_INCLUDE_PATH}
24+
${SIP_INCLUDE_DIR}
25+
${QT_QTCORE_INCLUDE_DIR}
26+
${QT_QTGUI_INCLUDE_DIR}
27+
${QT_QTNETWORK_INCLUDE_DIR}
28+
${QT_QTSVG_INCLUDE_DIR}
29+
${QT_QTXML_INCLUDE_DIR}
30+
${GDAL_INCLUDE_DIR}
31+
${GEOS_INCLUDE_DIR}
32+
${QWT_INCLUDE_DIR}
33+
${QEXTSERIALPORT_INCLUDE_DIR}
34+
35+
../src/core
36+
../src/core/pal
37+
../src/core/composer
38+
../src/core/diagram
39+
../src/core/gps
40+
../src/core/raster
41+
../src/core/renderer
42+
../src/core/symbology
43+
../src/core/symbology-ng
44+
45+
../src/gui/raster
46+
../src/gui/attributetable
47+
48+
${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h
4949
)
5050

5151
IF(NOT WITH_TOUCH)
@@ -80,11 +80,11 @@ ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core)
8080

8181
# additional gui includes
8282
INCLUDE_DIRECTORIES(
83-
../src/gui
84-
../src/gui/symbology-ng
85-
../src/plugins
86-
${CMAKE_BINARY_DIR}/src/gui
87-
${CMAKE_BINARY_DIR}/src/ui
83+
../src/gui
84+
../src/gui/symbology-ng
85+
../src/plugins
86+
${CMAKE_BINARY_DIR}/src/gui
87+
${CMAKE_BINARY_DIR}/src/ui
8888
)
8989

9090
# gui module
@@ -95,22 +95,22 @@ ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui)
9595

9696
# additional analysis includes
9797
INCLUDE_DIRECTORIES(
98-
../src/analysis/vector
99-
../src/analysis/raster
100-
../src/analysis/network
101-
../src/analysis/interpolation
102-
${CMAKE_BINARY_DIR}/src/analysis/vector
103-
${CMAKE_BINARY_DIR}/src/analysis/network
104-
${CMAKE_BINARY_DIR}/src/analysis/raster
105-
${CMAKE_BINARY_DIR}/src/analysis/interpolation
98+
../src/analysis/vector
99+
../src/analysis/raster
100+
../src/analysis/network
101+
../src/analysis/interpolation
102+
${CMAKE_BINARY_DIR}/src/analysis/vector
103+
${CMAKE_BINARY_DIR}/src/analysis/network
104+
${CMAKE_BINARY_DIR}/src/analysis/raster
105+
${CMAKE_BINARY_DIR}/src/analysis/interpolation
106106
)
107107

108108
# analysis module
109109
FILE(GLOB sip_files_analysis
110-
analysis/*.sip
111-
analysis/raster/*.sip
112-
analysis/vector/*.sip
113-
analysis/interpolation/*.sip
110+
analysis/*.sip
111+
analysis/raster/*.sip
112+
analysis/vector/*.sip
113+
analysis/interpolation/*.sip
114114
)
115115
SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis})
116116
SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api)
@@ -170,4 +170,3 @@ IF(WITH_PY_COMPILE)
170170
DEPENDS pyutils
171171
)
172172
ENDIF(WITH_PY_COMPILE)
173-

‎src/app/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,10 @@ INCLUDE_DIRECTORIES(
409409
${CMAKE_CURRENT_BINARY_DIR}/../ui
410410
${QWT_INCLUDE_DIR}
411411
${QT_QTUITOOLS_INCLUDE_DIR}
412+
${QEXTSERIALPORT_INCLUDE_DIR}
412413
../analysis/raster
413414
../core
414-
../core/gps ../core/gps/qextserialport
415+
../core/gps
415416
../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
416417
../gui ../gui/symbology-ng ../gui/attributetable ../gui/raster
417418
../plugins
@@ -420,7 +421,7 @@ INCLUDE_DIRECTORIES(
420421
)
421422

422423
IF (ANDROID)
423-
INCLUDE_DIRECTORIES(${ANDROID_NDK_TOOLCHAIN_ROOT}/sysroot/usr/include)
424+
INCLUDE_DIRECTORIES(${ANDROID_NDK_TOOLCHAIN_ROOT}/sysroot/usr/include)
424425
ENDIF (ANDROID)
425426

426427
IF (HAVE_SPATIALITE)

‎src/core/CMakeLists.txt

Lines changed: 33 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
SET(QGIS_CORE_SRCS
77

8-
gps/qextserialport/qextserialport.cpp
9-
gps/qextserialport/qextserialenumerator.cpp
10-
118
gps/qgsgpsconnection.cpp
129
gps/qgsgpsconnectionregistry.cpp
1310
gps/qgsnmeaconnection.cpp
@@ -212,23 +209,29 @@ SET(QGIS_CORE_SRCS
212209
qgsscaleutils.cpp
213210
)
214211

215-
IF(WIN32)
216-
SET(QGIS_CORE_SRCS
217-
${QGIS_CORE_SRCS}
218-
gps/qextserialport/win_qextserialport.cpp
219-
)
220-
ADD_DEFINITIONS(-D_TTY_WIN_)
221-
ELSE(WIN32)
222-
SET(QGIS_CORE_SRCS
223-
${QGIS_CORE_SRCS}
224-
gps/qextserialport/posix_qextserialport.cpp
212+
IF (WITH_INTERNAL_QEXTSERIALPORT)
213+
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
214+
gps/qextserialport/qextserialport.cpp
215+
gps/qextserialport/qextserialenumerator.cpp
225216
)
226-
ADD_DEFINITIONS(-D_TTY_POSIX_)
227-
ENDIF(WIN32)
217+
218+
IF(WIN32)
219+
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
220+
gps/qextserialport/win_qextserialport.cpp
221+
)
222+
ADD_DEFINITIONS(-D_TTY_WIN_)
223+
ELSE(WIN32)
224+
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
225+
gps/qextserialport/posix_qextserialport.cpp
226+
)
227+
ADD_DEFINITIONS(-D_TTY_POSIX_)
228+
ENDIF(WIN32)
229+
ELSE (WITH_INTERNAL_QEXTSERIALPORT)
230+
INCLUDE_DIRECTORIES(${QEXTSERIALPORT_INCLUDE_DIR})
231+
ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
228232

229233
IF (QT_MOBILITY_LOCATION_FOUND)
230-
SET(QGIS_CORE_SRCS
231-
${QGIS_CORE_SRCS}
234+
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
232235
gps/qgsqtlocationconnection.cpp
233236
)
234237
ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -250,8 +253,7 @@ IF (WITH_INTERNAL_SPATIALITE)
250253
ADD_DEFINITIONS(-D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1)
251254
ADD_DEFINITIONS(-DSQLITE_ENABLE_RTREE=1)
252255

253-
SET(QGIS_CORE_SRCS
254-
${QGIS_CORE_SRCS}
256+
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
255257
spatialite/sqlite3.c
256258
spatialite/spatialite.c
257259
)
@@ -316,16 +318,19 @@ SET(QGIS_CORE_MOC_HDRS
316318
gps/qgsgpsdetector.h
317319
gps/qgsnmeaconnection.h
318320
gps/qgsgpsdconnection.h
319-
gps/qextserialport/qextserialport.h
320-
gps/qextserialport/qextserialenumerator.h
321321

322322
symbology-ng/qgscptcityarchive.h
323323
)
324324

325+
IF (WITH_INTERNAL_QEXTSERIALPORT)
326+
SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS}
327+
gps/qextserialport/qextserialport.h
328+
gps/qextserialport/qextserialenumerator.h
329+
)
330+
ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
325331

326332
IF (QT_MOBILITY_LOCATION_FOUND)
327-
SET(QGIS_CORE_MOC_HDRS
328-
${QGIS_CORE_MOC_HDRS}
333+
SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS}
329334
gps/qgsqtlocationconnection.h
330335
)
331336
ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -474,8 +479,7 @@ SET(QGIS_CORE_HDRS
474479
)
475480

476481
IF (QT_MOBILITY_LOCATION_FOUND)
477-
SET(QGIS_CORE_HDRS
478-
${QGIS_CORE_HDRS}
482+
SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
479483
gps/qgsqtlocationconnection.h
480484
)
481485
ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -558,6 +562,10 @@ IF(APPLE)
558562
TARGET_LINK_LIBRARIES(qgis_core "-framework CoreFoundation -framework IOKit")
559563
ENDIF(APPLE)
560564

565+
IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
566+
TARGET_LINK_LIBRARIES(qgis_core ${QEXTSERIALPORT_LIBRARY})
567+
ENDIF (NOT WITH_INTERNAL_QEXTSERIALPORT)
568+
561569
IF (QT_MOBILITY_LOCATION_FOUND)
562570
TARGET_LINK_LIBRARIES(qgis_core ${QT_MOBILITY_LOCATION_LIBRARY})
563571
ENDIF (QT_MOBILITY_LOCATION_FOUND)

‎src/plugins/gps_importer/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,9 @@ ADD_LIBRARY (gpsimporterplugin MODULE ${GPS_SRCS} ${GPS_MOC_SRCS} ${GPS_RCC_SRCS
3737
INCLUDE_DIRECTORIES(
3838
${CMAKE_CURRENT_SOURCE_DIR}
3939
${CMAKE_CURRENT_BINARY_DIR}
40-
../../core ../../core/gps ../../core/gps/qextserialport
41-
40+
${QEXTSERIALPORT_INCLUDE_DIR}
41+
../../core
42+
../../core/gps
4243
../../gui
4344
..
4445
${EXPAT_INCLUDE_DIR}
@@ -49,7 +50,6 @@ TARGET_LINK_LIBRARIES(gpsimporterplugin
4950
qgis_gui
5051
)
5152

52-
5353
########################################################
5454
# Install
5555

0 commit comments

Comments
 (0)
Please sign in to comment.