Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3a793264
Commit
3a793264
authored
Apr 08, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get rid of $$qtlibrarytarget
This just mangles the library names for no good reason.
parent
e485eb05
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
22 deletions
+4
-22
QGCApplication.pro
QGCApplication.pro
+3
-21
QGCLocationPlugin.pro
QGCLocationPlugin.pro
+1
-1
No files found.
QGCApplication.pro
View file @
3a793264
...
...
@@ -36,32 +36,14 @@ message(BASEDIR $$BASEDIR DESTDIR $$DESTDIR TARGET $$TARGET)
#
QGC
QtLocation
plugin
LIBS
+=
-
L
$$
{
LOCATION_PLUGIN_DESTDIR
}
LIBS
+=
-
l
$$
{
LOCATION_PLUGIN_NAME
}
LinuxBuild
{
LIBS
+=
-
l
$$
{
LOCATION_PLUGIN_NAME
}
LinuxBuild
|
MacBuild
{
PRE_TARGETDEPS
+=
$$
{
LOCATION_PLUGIN_DESTDIR
}
/
lib
$$
{
LOCATION_PLUGIN_NAME
}.
a
}
WindowsBuild
{
DebugBuild
{
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
}
PRE_TARGETDEPS
+=
$$
{
LOCATION_PLUGIN_DESTDIR
}
/
$$
{
LOCATION_PLUGIN_NAME
}.
lib
}
#
Qt
configuration
...
...
QGCLocationPlugin.pro
View file @
3a793264
include
(
QGCCommon
.
pri
)
TEMPLATE
=
lib
TARGET
=
$$
qtLibraryTarget
(
QGeoServiceProviderFactoryQGC
)
TARGET
=
QGeoServiceProviderFactoryQGC
CONFIG
+=
plugin
static
QT
+=
location
-
private
positioning
-
private
network
PLUGIN_TYPE
=
geoservices
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment