refs #461 Use the REQUIRES variable in the leaf projects instead of conditions at the SUBDIRS level.

2026-04-02 06:35:52 +08:00 · 2015-11-23 20:55:38 +00:00
parent d32f211a71
commit 9968ccbbdb
21 changed files with 53 additions and 59 deletions
--- a/src/plugins/simulator/fs9/fs9.pro
+++ b/src/plugins/simulator/fs9/fs9.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,FS9)
+
 QT       += core dbus gui network concurrent xml

 TARGET = simulatorfs9
--- a/src/plugins/simulator/fscommon/fscommon.pro
+++ b/src/plugins/simulator/fscommon/fscommon.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,FSX|FS9)
+
 QT       += core dbus concurrent xml

 TARGET = simulatorfscommon
--- a/src/plugins/simulator/fsx/fsx.pro
+++ b/src/plugins/simulator/fsx/fsx.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,FSX)
+
 QT       += core dbus gui network concurrent xml

 TARGET = simulatorfsx
--- a/src/plugins/simulator/fsxconfig/fsxconfig.pro
+++ b/src/plugins/simulator/fsxconfig/fsxconfig.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,FSX)
+
 QT       += core widgets dbus network

 TARGET = simulatorfsxconfig
--- a/src/plugins/simulator/simulator.pro
+++ b/src/plugins/simulator/simulator.pro
@@ -3,21 +3,11 @@ load(common_pre)
 TEMPLATE = subdirs
 CONFIG += ordered

-if (contains(BLACK_CONFIG, FSX) | contains(BLACK_CONFIG, FS9)) {
-    SUBDIRS += fscommon
-}
-
-contains(BLACK_CONFIG, FSX) {
-    SUBDIRS += fsx
-    SUBDIRS += fsxconfig
-}
-contains(BLACK_CONFIG, FS9) {
-    SUBDIRS += fs9
-}
-
-contains(BLACK_CONFIG, XPlane) {
-    SUBDIRS += xplane
-    SUBDIRS += xplaneconfig
-}
+SUBDIRS += fscommon
+SUBDIRS += fsx
+SUBDIRS += fsxconfig
+SUBDIRS += fs9
+SUBDIRS += xplane
+SUBDIRS += xplaneconfig

 load(common_post)
--- a/src/plugins/simulator/xplane/xplane.pro
+++ b/src/plugins/simulator/xplane/xplane.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,XPlane)
+
 QT       += core dbus network

 TARGET = simulatorxplane
--- a/src/plugins/simulator/xplaneconfig/xplaneconfig.pro
+++ b/src/plugins/simulator/xplaneconfig/xplaneconfig.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,XPlane)
+
 QT       += core widgets dbus

 TARGET = simulatorxplaneconfig