Skip to content
Permalink
Browse files

move QExtSerialPort to external libs directory

  • Loading branch information
3nids committed Jan 19, 2018
1 parent 912bbe3 commit 204eaf88ea43b4b02f567752273cdc35ce96f8bc
@@ -233,7 +233,7 @@ IF(WITH_CORE)
FIND_PACKAGE(LibZip REQUIRED)

IF (WITH_INTERNAL_QEXTSERIALPORT)
SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)
SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/external/qextserialport)
ELSE (WITH_INTERNAL_QEXTSERIALPORT)
FIND_PACKAGE(Qextserialport REQUIRED)
ENDIF(WITH_INTERNAL_QEXTSERIALPORT)
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -562,18 +562,18 @@ ENDIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")

IF (WITH_INTERNAL_QEXTSERIALPORT)
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
gps/qextserialport/qextserialport.cpp
gps/qextserialport/qextserialenumerator.cpp
${CMAKE_SOURCE_DIR}/external/qextserialport/qextserialport.cpp
${CMAKE_SOURCE_DIR}/external/qextserialport/qextserialenumerator.cpp
)
IF(WIN32)
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
gps/qextserialport/win_qextserialport.cpp
${CMAKE_SOURCE_DIR}/external/qextserialport/win_qextserialport.cpp
)
ADD_DEFINITIONS(-D_TTY_WIN_)

ELSE(WIN32)
SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
gps/qextserialport/posix_qextserialport.cpp
${CMAKE_SOURCE_DIR}/external/qextserialport/posix_qextserialport.cpp
)
ADD_DEFINITIONS(-D_TTY_POSIX_)
ENDIF(WIN32)
@@ -810,8 +810,8 @@ ENDIF(NOT WITH_QTWEBKIT)

IF (WITH_INTERNAL_QEXTSERIALPORT)
SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS}
gps/qextserialport/qextserialport.h
gps/qextserialport/qextserialenumerator.h
${CMAKE_SOURCE_DIR}/external/qextserialport/qextserialport.h
${CMAKE_SOURCE_DIR}/external/qextserialport/qextserialenumerator.h
)
ENDIF (WITH_INTERNAL_QEXTSERIALPORT)

@@ -1236,9 +1236,12 @@ INCLUDE_DIRECTORIES(
renderer
scalebar
symbology
gps/qextserialport
metadata
)
IF (WITH_INTERNAL_QEXTSERIALPORT)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/external/qextserialport)
ENDIF(WITH_INTERNAL_QEXTSERIALPORT)

INCLUDE_DIRECTORIES(SYSTEM
${LIBZIP_INCLUDE_DIRS}
${SPATIALINDEX_INCLUDE_DIR}
@@ -1252,6 +1255,7 @@ INCLUDE_DIRECTORIES(SYSTEM
${QTKEYCHAIN_INCLUDE_DIR}
)


IF (APPLE)
# Libtasn1 is for DER-encoded PKI ASN.1 parsing/extracting workarounds
INCLUDE_DIRECTORIES(SYSTEM

0 comments on commit 204eaf8

Please sign in to comment.
You can’t perform that action at this time.