From f993a7a0c7cfe19cd5256de7be590edfeef749c6 Mon Sep 17 00:00:00 2001 From: cwabbott Date: Sun, 23 Jan 2011 04:00:51 +0000 Subject: [PATCH] Fixed ground.pro build system by making uavobjects.pro run qmake on openpilotgcs.pro as discussed in the forums. Now running make should handle uavobject dependencies correctly. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2539 ebee16cc-31ac-478f-84a7-5cbb03baadba --- ground/uavobjects/uavobjects.pro | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ground/uavobjects/uavobjects.pro b/ground/uavobjects/uavobjects.pro index 731e52ba1..159dcef0e 100644 --- a/ground/uavobjects/uavobjects.pro +++ b/ground/uavobjects/uavobjects.pro @@ -21,9 +21,15 @@ win32 { win32:MKDIR=$(MKDIR) !win32:MKDIR=$(MKDIR) -p +win32:SPEC = win32-g++ +macx-g++:SPEC = macx-g++ +linux-g++:SPEC = linux-g++ + uavobjects.target = FORCE uavobjects.commands += -$${MKDIR} $$targetPath(../../uavobject-synthetics) $$addNewline() uavobjects.commands += cd $$targetPath(../../uavobject-synthetics) && uavobjects.commands += $$targetPath(../ground/uavobjgenerator/$${BUILD_SUBDIR}uavobjgenerator) uavobjects.commands += -gcs ../../shared/uavobjectdefinition ../.. $$addNewline() +uavobjects.commands += cd $$targetPath(../openpilotgcs) && +uavobjects.commands += $(QMAKE) ../../../ground/openpilotgcs/openpilotgcs.pro -spec $$SPEC -r $$addNewline() QMAKE_EXTRA_TARGETS += uavobjects