sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix r12732

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@12733 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-01-11 11:37:25 +00:00
parent 6ec0217c45
commit 90faef4ca6
3 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/core/CMakeLists.txt
View File

@ -152,18 +152,12 @@ IF(WIN32)
gps/qextserialport/win_qextserialport.cpp
)
ADD_DEFINITIONS(-D_TTY_WIN_)
TARGET_LINK_LIBRARIES(qgis_core setupapi)
ELSE(WIN32)
SET(QGIS_CORE_SRCS
${QGIS_CORE_SRCS}
gps/qextserialport/posix_qextserialport.cpp
)
ADD_DEFINITIONS(-D_TTY_POSIX_)
IF(APPLE)
FIND_LIBRARY(IOKIT_LIBRARY IOKit)
TARGET_LINK_LIBRARIES(qgis_core ${IOKIT_LIBRARY))
ENDIF(APPLE)
ENDIF(WIN32)
IF (WITH_INTERNAL_SPATIALITE)
@ -218,36 +212,38 @@ SET_SOURCE_FILES_PROPERTIES(
ENDIF (MSVC AND PEDANTIC)
SET(QGIS_CORE_MOC_HDRS
qgsapplication.h
qgscontexthelp.h
qgscoordinatetransform.h
qgsdataprovider.h
qgshttptransaction.h
qgsmaplayer.h
qgsmaplayerregistry.h
qgsmaprenderer.h
qgsmessageoutput.h
qgsproject.h
qgsrunprocess.h
qgsvectorlayer.h
qgsrasterdataprovider.h
qgsapplication.h
qgscontexthelp.h
qgscoordinatetransform.h
qgsdataprovider.h
qgshttptransaction.h
qgsmaplayer.h
qgsmaplayerregistry.h
qgsmaprenderer.h
qgsmessageoutput.h
qgsproject.h
qgsrunprocess.h
qgsvectorlayer.h
qgsrasterdataprovider.h
composer/qgscomposerlegend.h
composer/qgscomposermap.h
composer/qgscomposerpicture.h
composer/qgscomposerscalebar.h
composer/qgscomposeritem.h
composer/qgscomposeritemgroup.h
composer/qgscomposershape.h
composer/qgscomposertable.h
composer/qgscomposition.h
composer/qgslegendmodel.h
gps/qgsgpsconnection.h
gps/qgsnmeaconnection.h
gps/qextserialport/qextserialenumerator.h
gps/qextserialport/qextserialport.h
symbology/qgsmarkercatalogue.h
raster/qgsrasterlayer.h
composer/qgscomposerlegend.h
composer/qgscomposermap.h
composer/qgscomposerpicture.h
composer/qgscomposerscalebar.h
composer/qgscomposeritem.h
composer/qgscomposeritemgroup.h
composer/qgscomposershape.h
composer/qgscomposertable.h
composer/qgscomposition.h
composer/qgslegendmodel.h
symbology/qgsmarkercatalogue.h
raster/qgsrasterlayer.h
gps/qgsgpsconnection.h
gps/qgsnmeaconnection.h
gps/qextserialport/qextserialport.h
gps/qextserialport/qextserialenumerator.h
)
QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
@ -321,13 +317,15 @@ ADD_DEPENDENCIES(qgis_core svnversion)
# because of htonl
IF (WIN32)
TARGET_LINK_LIBRARIES(qgis_core wsock32)
IF (MSVC)
# needed for linking to gdal which needs odbc
# TARGET_LINK_LIBRARIES(qgis_core odbc32 odbccp32)
ENDIF (MSVC)
FIND_LIBRARY(SETUPAPI_LIBRARY setupapi)
TARGET_LINK_LIBRARIES(qgis_core wsock32 ${SETUPAPI_LIBRARY})
ENDIF (WIN32)
IF(APPLE)
FIND_LIBRARY(IOKIT_LIBRARY IOKit)
TARGET_LINK_LIBRARIES(qgis_core ${IOKIT_LIBRARY})
ENDIF(APPLE)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}

2
src/core/gps/qextserialport/qextserialenumerator.h
View File

@ -34,6 +34,8 @@ struct QextPortInfo {
int productID; ///< Product ID
};
#undef QT_GUI_LIB
#ifdef Q_OS_WIN
#ifdef QT_GUI_LIB
#include <QWidget>

1
src/core/gps/qgsgpsconnection.cpp
View File

@ -20,6 +20,7 @@
#include <QCoreApplication>
#include <QTime>
#include <QIODevice>
#include <QStringList>
#include "qextserialport.h"
#include "qextserialenumerator.h"