rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Code Issues Releases Activity

OP-1666 deb tidy and OP-1663: move Qt inside OP

Browse Source 
lib dir to avoid conflict and match Qt dir structure so their rpath is correct
This commit is contained in:
James Duley 2015-01-10 10:53:07 +13:00
parent ea6b2dd9b6
commit 95fe38143f
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -81,7 +81,7 @@ $(foreach var, $(SANITIZE_DEPRECATED_VARS), $(eval $(call SANITIZE_VAR,$(var),de
# Make sure this isn't being run as root unless installing (no whoami on Windows, but that is ok here)
ifeq ($(shell whoami 2>/dev/null),root)
ifeq ($(filter install install_qt all_clean,$(MAKECMDGOALS)),)
ifeq ($(filter install all_clean,$(MAKECMDGOALS)),)
$(error You should not be running this as root)
endif
endif
@ -946,13 +946,6 @@ install:
$(V1) rm $(DESTDIR)/$(datadir)/openpilotgcs/translations/Makefile
.PHONY: install_qt
install_qt:
@$(ECHO) " INSTALLING QT TO $(DESTDIR)/)"
$(V1) $(MKDIR) -p $(DESTDIR)$(libdir)
$(V1) $(INSTALL) $(BUILD_DIR)/openpilotgcs_$(GCS_BUILD_CONF)/lib/qt5 $(DESTDIR)$(libdir)
##############################
#
# Help message, the default Makefile goal
@ -1090,7 +1083,6 @@ help:
@$(ECHO) " opfw_resource - Generate resources to embed firmware binaries into the GCS"
@$(ECHO) " dist - Generate source archive for distribution"
@$(ECHO) " install - Install GCS to \"DESTDIR\" with prefix \"prefix\" (Linux only)"
@$(ECHO) " install_qt - Install QT to \"DESTDIR\" with prefix \"prefix\" (Linux only)"
@$(ECHO)
@$(ECHO) " [Code Formatting]"
@$(ECHO) " uncrustify_<source> - Reformat <source> code according to the project's standards"

7
ground/openpilotgcs/openpilotgcs.pri
View File

@ -112,9 +112,10 @@ macx {
copyqt = $$copydata
} else {
GCS_APP_TARGET = openpilotgcs
GCS_QT_LIBRARY_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5
GCS_QT_PLUGINS_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/plugins
GCS_QT_QML_PATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5/qml
GCS_QT_BASEPATH = $$GCS_BUILD_TREE/$$GCS_LIBRARY_BASENAME/qt5
GCS_QT_LIBRARY_PATH = $$GCS_QT_BASEPATH/lib
GCS_QT_PLUGINS_PATH = $$GCS_QT_BASEPATH/plugins
GCS_QT_QML_PATH = $$GCS_QT_BASEPATH/qml
QT_INSTALL_DIR = $$clean_path($$[QT_INSTALL_LIBS]/../../../..)
equals(QT_INSTALL_DIR, $$TOOLS_DIR) {

2
package/linux/debian/rules
View File

@ -22,4 +22,4 @@ override_dh_auto_test:
# Fails non-silently because it is run under fakeroot.
override_dh_auto_install:
dh_auto_install -- prefix=/usr install_qt
dh_auto_install -- prefix=/usr