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

2026-03-22 23:05:36 +08:00 · 2015-11-23 20:55:38 +00:00
parent d32f211a71
commit 9968ccbbdb
21 changed files with 53 additions and 59 deletions
--- a/docs/docs.pro
+++ b/docs/docs.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,Doxygen)
+
 TEMPLATE = lib
 CONFIG += staticlib
 CONFIG -= qt
--- a/samples/samples.pro
+++ b/samples/samples.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,Samples)
+
 TEMPLATE = subdirs
 CONFIG += ordered

--- a/src/blackcore/blackcore.pro
+++ b/src/blackcore/blackcore.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,BlackCore)
+
 # GUI is required for the matrix classes
 # Network for host info etc.
 QT       += network dbus xml multimedia
--- a/src/blackgui/blackgui.pro
+++ b/src/blackgui/blackgui.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,BlackGui)
+
 QT       += network dbus gui svg widgets

 TARGET = blackgui
--- a/src/blackinput/blackinput.pro
+++ b/src/blackinput/blackinput.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,BlackInput)
+
 QT       += network dbus gui widgets multimedia

 TARGET = blackinput
--- a/src/blacksound/blacksound.pro
+++ b/src/blacksound/blacksound.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,BlackSound)
+
 QT       += network dbus gui multimedia

 TARGET = blacksound
--- 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
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,38 +4,15 @@ TEMPLATE = subdirs
 CONFIG += ordered

 SUBDIRS += blackmisc
-
-contains(BLACK_CONFIG, BlackSound) {
-    SUBDIRS += blacksound
-}
-
-contains(BLACK_CONFIG, BlackInput) {
-    SUBDIRS += blackinput
-}
-
-contains(BLACK_CONFIG, BlackCore) {
-    SUBDIRS += blackcore
-    contains(BLACK_CONFIG, BlackGui) {
-        SUBDIRS += blackgui
-        contains(BLACK_CONFIG, SwiftGui) {
-            SUBDIRS += swiftguistandard
-        }
-        contains(BLACK_CONFIG, SwiftCore) {
-            SUBDIRS += swiftcore
-        }
-        contains(BLACK_CONFIG, SwiftData) {
-            SUBDIRS += swiftdata
-        }
-        contains(BLACK_CONFIG, SwiftLauncher) {
-            SUBDIRS += swiftlauncher
-        }
-    }
-}
-
-contains(BLACK_CONFIG, XPlane) {
-    SUBDIRS += xbus/xbus.pro
-}
-
+SUBDIRS += blacksound
+SUBDIRS += blackinput
+SUBDIRS += blackcore
+SUBDIRS += blackgui
+SUBDIRS += swiftguistandard
+SUBDIRS += swiftcore
+SUBDIRS += swiftdata
+SUBDIRS += swiftlauncher
+SUBDIRS += xbus
 SUBDIRS += plugins

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

+REQUIRES += contains(BLACK_CONFIG,SwiftCore)
+
 QT       += core dbus network xml multimedia gui svg

 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
--- a/src/swiftdata/swiftdata.pro
+++ b/src/swiftdata/swiftdata.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,SwiftData)
+
 QT       += core dbus network xml multimedia gui svg

 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
--- a/src/swiftguistandard/swiftguistandard.pro
+++ b/src/swiftguistandard/swiftguistandard.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,SwiftGui)
+
 QT       += core dbus gui svg network xml multimedia

 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
--- a/src/swiftlauncher/swiftlauncher.pro
+++ b/src/swiftlauncher/swiftlauncher.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,SwiftLauncher)
+
 QT       += core dbus gui svg network xml multimedia

 # QWebEngine is not supported for MinGW
--- a/src/xbus/xbus.pro
+++ b/src/xbus/xbus.pro
@@ -1,5 +1,7 @@
 load(common_pre)

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

 TEMPLATE = lib
--- a/swift.pro
+++ b/swift.pro
@@ -6,20 +6,11 @@ CONFIG += ordered
 OTHER_FILES += mkspecs/features/*.prf
 OTHER_FILES += mkspecs/features/*.pri

-contains(BLACK_CONFIG, Doxygen) {
 SUBDIRS += docs
-}
-
 SUBDIRS += resources
 SUBDIRS += src
-
-contains(BLACK_CONFIG, Samples) {
-    SUBDIRS += samples
-}
-
-contains(BLACK_CONFIG, Unittests) {
-    SUBDIRS += tests
-}
+SUBDIRS += samples
+SUBDIRS += tests

 include(install.pri)

--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,5 +1,7 @@
 load(common_pre)

+REQUIRES += contains(BLACK_CONFIG,Unittests)
+
 TEMPLATE = subdirs
 CONFIG += ordered