From c02ccfef0a6917000f31985e12c9ca35258a835f Mon Sep 17 00:00:00 2001 From: LibrePilot Packager Date: Thu, 16 Jul 2015 21:41:49 +0100 Subject: [PATCH] LP-1: moved openpilotgcslibrary.pri to library.pri Change-Id: Ie4eb9f6f64288e7c4b8d961ad4a2cc6b86e7fde8 --- ground/gcs/src/{openpilotgcslibrary.pri => library.pri} | 0 ground/gcs/src/libs/aggregation/aggregation.pro | 2 +- ground/gcs/src/libs/extensionsystem/extensionsystem.pro | 2 +- ground/gcs/src/libs/glc_lib/glc_lib.pro | 2 +- ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro | 2 +- ground/gcs/src/libs/qscispinbox/qscispinbox.pro | 2 +- ground/gcs/src/libs/qtconcurrent/qtconcurrent.pro | 2 +- ground/gcs/src/libs/qwt/src/src.pro | 2 +- ground/gcs/src/libs/sdlgamepad/sdlgamepad.pro | 2 +- ground/gcs/src/libs/utils/utils.pro | 2 +- ground/gcs/src/libs/version_info/version_info.pro | 2 +- 11 files changed, 10 insertions(+), 10 deletions(-) rename ground/gcs/src/{openpilotgcslibrary.pri => library.pri} (100%) diff --git a/ground/gcs/src/openpilotgcslibrary.pri b/ground/gcs/src/library.pri similarity index 100% rename from ground/gcs/src/openpilotgcslibrary.pri rename to ground/gcs/src/library.pri diff --git a/ground/gcs/src/libs/aggregation/aggregation.pro b/ground/gcs/src/libs/aggregation/aggregation.pro index a542b181b..0f7017a01 100644 --- a/ground/gcs/src/libs/aggregation/aggregation.pro +++ b/ground/gcs/src/libs/aggregation/aggregation.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = Aggregation -include(../../openpilotgcslibrary.pri) +include(../../library.pri) DEFINES += AGGREGATION_LIBRARY diff --git a/ground/gcs/src/libs/extensionsystem/extensionsystem.pro b/ground/gcs/src/libs/extensionsystem/extensionsystem.pro index 49d35d33a..9d07db733 100644 --- a/ground/gcs/src/libs/extensionsystem/extensionsystem.pro +++ b/ground/gcs/src/libs/extensionsystem/extensionsystem.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = ExtensionSystem DEFINES += EXTENSIONSYSTEM_LIBRARY -include(../../openpilotgcslibrary.pri) +include(../../library.pri) include(extensionsystem_dependencies.pri) unix:!macx:!freebsd*:LIBS += -ldl diff --git a/ground/gcs/src/libs/glc_lib/glc_lib.pro b/ground/gcs/src/libs/glc_lib/glc_lib.pro index c9199a2a3..578346fcd 100644 --- a/ground/gcs/src/libs/glc_lib/glc_lib.pro +++ b/ground/gcs/src/libs/glc_lib/glc_lib.pro @@ -3,7 +3,7 @@ TARGET = GLC_lib #VERSION = 2.2.0 DEFINES += GLC_LIB_LIBRARY -include(../../openpilotgcslibrary.pri) +include(../../library.pri) QT += core opengl diff --git a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro index 93627ddc5..5d4e3e346 100644 --- a/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro +++ b/ground/gcs/src/libs/opmapcontrol/src/mapwidget/mapwidget.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = opmapwidget DEFINES += OPMAPWIDGET_LIBRARY -include(../../../../openpilotgcslibrary.pri) +include(../../../../library.pri) # DESTDIR = ../build SOURCES += mapgraphicitem.cpp \ diff --git a/ground/gcs/src/libs/qscispinbox/qscispinbox.pro b/ground/gcs/src/libs/qscispinbox/qscispinbox.pro index 028a562c5..65f865b1c 100644 --- a/ground/gcs/src/libs/qscispinbox/qscispinbox.pro +++ b/ground/gcs/src/libs/qscispinbox/qscispinbox.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = QScienceSpinBox -include(../../openpilotgcslibrary.pri) +include(../../library.pri) QT += widgets diff --git a/ground/gcs/src/libs/qtconcurrent/qtconcurrent.pro b/ground/gcs/src/libs/qtconcurrent/qtconcurrent.pro index ef29d9188..e5d1cda2b 100644 --- a/ground/gcs/src/libs/qtconcurrent/qtconcurrent.pro +++ b/ground/gcs/src/libs/qtconcurrent/qtconcurrent.pro @@ -2,7 +2,7 @@ TEMPLATE = lib TARGET = QtConcurrent DEFINES += BUILD_QTCONCURRENT -include(../../openpilotgcslibrary.pri) +include(../../library.pri) HEADERS += \ qtconcurrent_global.h \ diff --git a/ground/gcs/src/libs/qwt/src/src.pro b/ground/gcs/src/libs/qwt/src/src.pro index d4b99b489..3d8a4ba37 100644 --- a/ground/gcs/src/libs/qwt/src/src.pro +++ b/ground/gcs/src/libs/qwt/src/src.pro @@ -33,7 +33,7 @@ DEFINES += QWT_LIBRARY # defined. Otherwise the debug version of the library # will not have the 'd' suffix it needs. # -include(../../../openpilotgcslibrary.pri) +include(../../../library.pri) # disable all warnings (no need for warnings as qwt sources are imported) CONFIG += warn_off diff --git a/ground/gcs/src/libs/sdlgamepad/sdlgamepad.pro b/ground/gcs/src/libs/sdlgamepad/sdlgamepad.pro index 92633eed7..3182f85ab 100644 --- a/ground/gcs/src/libs/sdlgamepad/sdlgamepad.pro +++ b/ground/gcs/src/libs/sdlgamepad/sdlgamepad.pro @@ -22,7 +22,7 @@ TEMPLATE = lib TARGET = sdlgamepad DEFINES += SDLGAMEPAD_LIBRARY -include(../../openpilotgcslibrary.pri) +include(../../library.pri) macx { # Ensures that SDL framework and header files are found when compiled with Qt5.2.1 diff --git a/ground/gcs/src/libs/utils/utils.pro b/ground/gcs/src/libs/utils/utils.pro index 3a6c39b4e..abf41e89f 100644 --- a/ground/gcs/src/libs/utils/utils.pro +++ b/ground/gcs/src/libs/utils/utils.pro @@ -11,7 +11,7 @@ QT += gui \ DEFINES += QTCREATOR_UTILS_LIB -include(../../openpilotgcslibrary.pri) +include(../../library.pri) DEFINES += DATA_REL_PATH=$$shell_quote(\"$$relative_path($$GCS_DATA_PATH, $$GCS_APP_PATH)\") diff --git a/ground/gcs/src/libs/version_info/version_info.pro b/ground/gcs/src/libs/version_info/version_info.pro index ab800ef28..2ac21ff84 100644 --- a/ground/gcs/src/libs/version_info/version_info.pro +++ b/ground/gcs/src/libs/version_info/version_info.pro @@ -1,7 +1,7 @@ TEMPLATE = lib TARGET = VersionInfo -include(../../openpilotgcslibrary.pri) +include(../../library.pri) include(../../python.pri) HEADERS = version_info.h