From a7e6f932450cc2c6be0c7c5c28f24ae005ff9a0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Devernay?= Date: Thu, 23 Jun 2016 10:30:52 +0200 Subject: [PATCH] fix Project.pro --- Project.pro | 40 +++++++++++++++++++++++--------- libs/qhttpserver/qhttpserver.pro | 1 - 2 files changed, 29 insertions(+), 12 deletions(-) diff --git a/Project.pro b/Project.pro index a67aacad89..3aab0b3af8 100644 --- a/Project.pro +++ b/Project.pro @@ -18,29 +18,47 @@ TEMPLATE = subdirs -# build things in the order we give -CONFIG += ordered - enable-breakpad { include(breakpadpro.pri) } SUBDIRS += \ HostSupport \ - libs/gflags \ - libs/glog \ - libs/ceres \ - libs/libmv \ - libs/openMVG \ - libs/qhttpserver \ - libs/hoedown \ - libs/libtess \ + gflags \ + glog \ + ceres \ + libmv \ + openMVG \ + qhttpserver \ + hoedown \ + libtess \ Engine \ Renderer \ Gui \ Tests \ App +# where to find the sub projects - give the folders +gflags.subdir = libs/gflags +glog.subdir = libs/glog +ceres.subdir = libs/ceres +libmv.subdir = libs/libmv +openMVG.subdir = libs/openMVG +qhttpserver.subdir = libs/qhttpserver +hoedown.subdir = libs/hoedown +libtess.subdir = libs/libtess + +# what subproject depends on others +glog.depends = gflags +ceres.depends = glog gflags +libmv.depends = gflags ceres +openMVG.depends = ceres +Engine.depends = libmv openMVG HostSupport libtess ceres +Renderer.depends = Engine +Gui.depends = Engine qhttpserver +Tests.depends = Gui Engine +App.depends = Gui Engine + OTHER_FILES += \ Global/Enums.h \ Global/GLIncludes.h \ diff --git a/libs/qhttpserver/qhttpserver.pro b/libs/qhttpserver/qhttpserver.pro index 0dc6a1925c..3330bdee41 100644 --- a/libs/qhttpserver/qhttpserver.pro +++ b/libs/qhttpserver/qhttpserver.pro @@ -1,3 +1,2 @@ -CONFIG += ordered TEMPLATE = subdirs SUBDIRS += src