From 3c4c080e46a8fa229d7e1fdaee82f750b3558aa0 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 27 Jan 2017 10:30:59 +0200 Subject: Add SUBDIRS in dependency order Once more, fix the order of SUBDIRS, since recursive qmake call does not handle .depends Task-number: QTBUG-45706 Change-Id: Ibe578a9f5e80079d1ba917915f169e0e0bc4203e Reviewed-by: Allan Sandfeld Jensen --- src/core/core.pro | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/core/core.pro b/src/core/core.pro index e495685eb..cda885921 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -20,9 +20,9 @@ use?(gn) { gn_run.file = gn_run.pro gn_run.depends = core_generator - SUBDIRS += gn_run \ - core_headers \ - core_generator + SUBDIRS += core_headers \ + core_generator \ + gn_run } else { # gyp_run.pro calls gyp through gyp_qtwebengine on the qmake step, and ninja on the make step. @@ -30,10 +30,7 @@ use?(gn) { gyp_run.depends = core_generator core_api.depends = gyp_run - SUBDIRS += gyp_run \ - core_api \ - core_module \ - core_headers \ + SUBDIRS += core_headers \ core_generator !win32 { @@ -48,4 +45,8 @@ use?(gn) { gyp_run.depends += gyp_configure_host gyp_configure_target SUBDIRS += gyp_configure_host gyp_configure_target } + + SUBDIRS += gyp_run \ + core_api \ + core_module } -- cgit v1.2.3