Skip to content

Q
qgroundcontrol
Commit 3a793264 authored by Don Gagne's avatar Don Gagne
Browse files
Options

Get rid of $$qtlibrarytarget 

This just mangles the library names for no good reason.
parent e485eb05
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 22 deletions
QGCApplication.pro
View file @ 3a793264
...@@ -36,32 +36,14 @@ message(BASEDIR $$BASEDIR DESTDIR $$DESTDIR TARGET $$TARGET) ...@@ -36,32 +36,14 @@ message(BASEDIR $$BASEDIR DESTDIR $$DESTDIR TARGET $$TARGET)
# QGC QtLocation plugin # QGC QtLocation plugin
LIBS += -L$${LOCATION_PLUGIN_DESTDIR} LIBS += -L$${LOCATION_PLUGIN_DESTDIR}
LIBS += -l$${LOCATION_PLUGIN_NAME}
LinuxBuild { LinuxBuild|MacBuild {
LIBS += -l$${LOCATION_PLUGIN_NAME}
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a
} }
WindowsBuild { WindowsBuild {
DebugBuild { PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}.lib
LIBS += -l$${LOCATION_PLUGIN_NAME}d
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}d.lib
}
ReleaseBuild {
LIBS += -l$${LOCATION_PLUGIN_NAME}
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}.lib
}
}
MacBuild {
DebugBuild {
LIBS += -l$${LOCATION_PLUGIN_NAME}_debug
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}_debug.a
}
ReleaseBuild {
LIBS += -l$${LOCATION_PLUGIN_NAME}
PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a
}
} }
# Qt configuration # Qt configuration
......
QGCLocationPlugin.pro
View file @ 3a793264
include(QGCCommon.pri) include(QGCCommon.pri)
TEMPLATE = lib TEMPLATE = lib
TARGET = $$qtLibraryTarget(QGeoServiceProviderFactoryQGC) TARGET = QGeoServiceProviderFactoryQGC
CONFIG += plugin static CONFIG += plugin static
QT += location-private positioning-private network QT += location-private positioning-private network
PLUGIN_TYPE = geoservices PLUGIN_TYPE = geoservices
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment