rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-31 16:52:10 +01:00
Code Issues Releases Activity

OP-1666 deb tidy: Removed FORCE_COPY_QT

Browse Source 
It does not really make sense because it is designed for OP Qt
which is copied by default if it exists.
This commit is contained in:
James Duley 2015-01-10 00:19:40 +13:00
parent 9cc7b654af
commit 240f862196
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -783,9 +783,6 @@ ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
export PACKAGE_NAME := OpenPilot export PACKAGE_NAME := OpenPilot
export PACKAGE_SEP := - export PACKAGE_SEP := -
# Copy the Qt libraries regardless whether the building machine needs them to run GCS
export FORCE_COPY_QT := true
# We can only package release builds # We can only package release builds
ifneq ($(GCS_BUILD_CONF),release) ifneq ($(GCS_BUILD_CONF),release)
$(error Packaging is currently supported for release builds only) $(error Packaging is currently supported for release builds only)

3
ground/openpilotgcs/openpilotgcs.pri
View File

@ -122,9 +122,6 @@ macx {
} else { } else {
copyqt = 0 copyqt = 0
} }
FORCE_COPY_QT = $$(FORCE_COPY_QT)
!isEmpty(FORCE_COPY_QT):copyqt = 1
} }
GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs GCS_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/openpilotgcs
GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins GCS_PLUGIN_PATH = $$GCS_LIBRARY_PATH/plugins