qgis-1.8.0-qextserialport.patch

Volker Fröhlich, 2012-11-02 03:04 PM

Download (7.43 KB)

View differences:

qgis-1.8.0-qextserialport/cmake/FindQextserialport.cmake 2012-11-02 20:40:57.854520284 +0100
1
# Find Qextserialport
2
# ~~~~~~~~
3
# Copyright (c) 2011, Jürgen E. Fischer <jef at norbit.de>
4
#
5
# Redistribution and use is allowed according to the terms of the BSD license.
6
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
7
#
8
# Once run this will define: 
9
# 
10
# QEXTSERIALPORT_FOUND       = system has Qextserialport lib
11
# QEXTSERIALPORT_LIBRARY     = full path to the Qextserialport library
12
# QEXTSERIALPORT_INCLUDE_DIR = where to find headers 
13
#
14

  
15

  
16
FIND_PATH(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATHS
17
  /usr/include
18
  /usr/local/include
19
  "$ENV{LIB_DIR}/include" 
20
  "$ENV{INCLUDE}" 
21
  PATH_SUFFIXES QtExtSerialPort
22
  )
23

  
24
FIND_LIBRARY(QEXTSERIALPORT_LIBRARY NAMES qextserialport-1.2 PATHS 
25
  /usr/lib
26
  /usr/local/lib
27
  "$ENV{LIB_DIR}/lib" 
28
  "$ENV{LIB}/lib" 
29
  )
30

  
31
IF (QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARY)
32
  SET(QEXTSERIALPORT_FOUND TRUE)
33
ENDIF (QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARY)
34

  
35
IF (QEXTSERIALPORT_FOUND)
36
  IF (NOT QEXTSERIALPORT_FIND_QUIETLY)
37
    MESSAGE(STATUS "Found Qextserialport: ${QEXTSERIALPORT_LIBRARY}")
38
  ENDIF (NOT QEXTSERIALPORT_FIND_QUIETLY)
39
ELSE (QEXTSERIALPORT_FOUND)
40
  IF (QEXTSERIALPORT_FIND_REQUIRED)
41
    MESSAGE(FATAL_ERROR "Could not find Qextserialport")
42
  ENDIF (QEXTSERIALPORT_FIND_REQUIRED)
43
ENDIF (QEXTSERIALPORT_FOUND)
qgis-1.8.0-qextserialport/CMakeLists.txt 2012-11-02 21:04:28.013021635 +0100
55 55

  
56 56
SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
57 57

  
58
SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport")
59

  
58 60
SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")
59 61
IF (WITH_SPATIALITE)
60 62
  SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
......
174 176
  FIND_PACKAGE(QwtPolar REQUIRED)
175 177
ENDIF(NOT WITH_INTERNAL_QWTPOLAR)
176 178

  
179
IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
180
  FIND_PACKAGE(Qextserialport REQUIRED)
181
ENDIF(NOT WITH_INTERNAL_QEXTSERIALPORT)
182

  
177 183
IF (NOT WITH_INTERNAL_SPATIALITE)
178 184
  FIND_PACKAGE(Sqlite3)
179 185
  IF (NOT SQLITE3_FOUND)
qgis-1.8.0-qextserialport/python/CMakeLists.txt 2012-11-02 20:49:38.101851101 +0100
14 14
  )
15 15
ENDIF (WITH_INTERNAL_SPATIALITE)
16 16

  
17
IF (WITH_INTERNAL_QEXTSERIALPORT)
18
  INCLUDE_DIRECTORIES(
19
    ../src/core/gps/qextserialport
20
  )
21
ELSE (WITH_INTERNAL_QEXTSERIALPORT)
22
  INCLUDE_DIRECTORIES(
23
    ${QEXTSERIALPORT_INCLUDE_DIR}
24
  )
25
ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
26

  
17 27
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
18 28
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
19 29

  
......
31 41
    ../src/core
32 42
    ../src/core/composer
33 43
    ../src/core/gps
34
    ../src/core/gps/qextserialport
35 44
    ../src/core/raster
36 45
    ../src/core/renderer
37 46
    ../src/core/symbology
qgis-1.8.0-qextserialport/src/app/CMakeLists.txt 2012-11-02 22:29:40.327221781 +0100
394 394
  ${QT_QTUITOOLS_INCLUDE_DIR}
395 395
  ../analysis/raster
396 396
  ../core
397
  ../core/gps ../core/gps/qextserialport
397
  ../core/gps
398 398
  ../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
399 399
  ../gui ../gui/symbology-ng ../gui/attributetable
400 400
  ../plugins
......
402 402
  gps
403 403
  )
404 404

  
405
IF (WITH_INTERNAL_QEXTSERIALPORT)
406
  INCLUDE_DIRECTORIES(
407
    ../core/gps/qextserialport
408
  )
409
ELSE (WITH_INTERNAL_QEXTSERIALPORT)
410
  INCLUDE_DIRECTORIES(
411
    ${QEXTSERIALPORT_INCLUDE_DIR}
412
  )
413
ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
414

  
415

  
405 416
IF (ANDROID)
406 417
    INCLUDE_DIRECTORIES(${ANDROID_NDK_TOOLCHAIN_ROOT}/sysroot/usr/include)
407 418
ENDIF (ANDROID)
qgis-1.8.0-qextserialport/src/core/CMakeLists.txt 2012-11-02 22:21:00.757952769 +0100
5 5

  
6 6
SET(QGIS_CORE_SRCS
7 7

  
8
  gps/qextserialport/qextserialport.cpp
9
  gps/qextserialport/qextserialenumerator.cpp
10

  
11 8
  gps/qgsgpsconnection.cpp
12 9
  gps/qgsgpsconnectionregistry.cpp
13 10
  gps/qgsnmeaconnection.cpp
......
184 181
  )
185 182
  ADD_DEFINITIONS(-D_TTY_WIN_)
186 183
ELSE(WIN32)
187
  SET(QGIS_CORE_SRCS
188
    ${QGIS_CORE_SRCS}
189
    gps/qextserialport/posix_qextserialport.cpp
190
  )
184
  IF (WITH_INTERNAL_QEXTSERIALPORT)
185
    SET(QGIS_CORE_SRCS
186
        ${QGIS_CORE_SRCS}
187
        gps/qextserialport/qextserialport.cpp
188
        gps/qextserialport/qextserialenumerator.cpp
189
        gps/qextserialport/posix_qextserialport.cpp
190
    )
191
  ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
191 192
  ADD_DEFINITIONS(-D_TTY_POSIX_)
192 193
ENDIF(WIN32)
193 194

  
......
198 199
  )
199 200
ENDIF (QT_MOBILITY_LOCATION_FOUND)
200 201

  
202

  
201 203
IF (WITH_INTERNAL_SPATIALITE)
202 204
  IF (WIN32 OR APPLE OR ANDROID)
203 205
    INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
......
277 279
  gps/qgsgpsdetector.h
278 280
  gps/qgsnmeaconnection.h
279 281
  gps/qgsgpsdconnection.h
280
  gps/qextserialport/qextserialport.h
281
  gps/qextserialport/qextserialenumerator.h
282 282
)
283 283

  
284
IF (WITH_INTERNAL_QEXTSERIALPORT)
285
  SET(QGIS_CORE_MOC_HDRS
286
    ${QGIS_CORE_MOC_HDRS}
287
    gps/qextserialport/qextserialport.h
288
    gps/qextserialport/qextserialenumerator.h
289
  )
290
ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
284 291

  
285 292
IF (QT_MOBILITY_LOCATION_FOUND)
286 293
  SET(QGIS_CORE_MOC_HDRS
......
435 442
  INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
436 443
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
437 444

  
445
IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
446
    INCLUDE_DIRECTORIES(${QEXTSERIALPORT_INCLUDE_DIR})
447
ENDIF (NOT WITH_INTERNAL_QEXTSERIALPORT)
448

  
438 449
IF (WIN32)
439 450
  IF (MSVC)
440 451
    ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllexport)")
......
503 514
  ${SPATIALINDEX_LIBRARY}
504 515
)
505 516

  
517
IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
518
  TARGET_LINK_LIBRARIES(qgis_core ${QEXTSERIALPORT_LIBRARY})
519
ENDIF (NOT WITH_INTERNAL_QEXTSERIALPORT)
520

  
506 521
IF (WITH_INTERNAL_SPATIALITE)
507 522
  IF (WIN32 OR APPLE)
508 523
    TARGET_LINK_LIBRARIES(qgis_core ${ICONV_LIBRARY})
qgis-1.8.0-qextserialport/src/plugins/gps_importer/CMakeLists.txt 2012-11-02 20:50:24.924541164 +0100
37 37
INCLUDE_DIRECTORIES(
38 38
     ${CMAKE_CURRENT_SOURCE_DIR}
39 39
     ${CMAKE_CURRENT_BINARY_DIR}
40
     ../../core ../../core/gps ../../core/gps/qextserialport
40
     ../../core ../../core/gps
41 41

  
42 42
     ../../gui
43 43
     ..
44 44
     ${EXPAT_INCLUDE_DIR}
45 45
)
46 46

  
47
IF (WITH_INTERNAL_QEXTSERIALPORT)
48
  INCLUDE_DIRECTORIES(
49
    ../../core/gps/qextserialport
50
  )
51
ELSE (WITH_INTERNAL_QEXTSERIALPORT)
52
  INCLUDE_DIRECTORIES(
53
    ${QEXTSERIALPORT_INCLUDE_DIR}
54
  )
55
ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
56

  
47 57
TARGET_LINK_LIBRARIES(gpsimporterplugin
48 58
  qgis_core
49 59
  qgis_gui