refs #624 Use conditional SUBDIRS instead of REQUIRES for enabling/disabling subprojects.

2026-04-20 04:25:42 +08:00 · 2016-03-21 00:57:27 +00:00
parent a895cc2c54
commit 1801616953
20 changed files with 50 additions and 52 deletions
--- a/docs/docs.pro
+++ b/docs/docs.pro
@@ -1,7 +1,5 @@
 load(common_pre)
 REQUIRES += contains(BLACK_CONFIG,Doxygen)
 TEMPLATE = lib
 CONFIG += staticlib
 CONFIG -= qt
--- a/samples/samples.pro
+++ b/samples/samples.pro
@@ -1,7 +1,5 @@
 load(common_pre)
 REQUIRES += contains(BLACK_CONFIG,Samples)
 TEMPLATE = subdirs
 CONFIG += ordered
--- a/src/blackcore/blackcore.pro
+++ b/src/blackcore/blackcore.pro
@@ -1,7 +1,5 @@
 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,7 +1,5 @@
 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,7 +1,5 @@
 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,7 +1,5 @@
 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,7 +1,5 @@
 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,7 +1,5 @@
 load(common_pre)
 REQUIRES += contains(BLACK_CONFIG,FSX|FS9)
 QT       += core dbus concurrent xml
 TARGET = simulatorfscommon
--- a/src/plugins/simulator/fsxconfig/fsxconfig.pro
+++ b/src/plugins/simulator/fsxconfig/fsxconfig.pro
@@ -1,7 +1,5 @@
 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,11 +3,19 @@ load(common_pre)
 TEMPLATE = subdirs
 CONFIG += ordered
-SUBDIRS += fscommon
+contains(BLACK_CONFIG,FSX|FS9) {
-SUBDIRS += fsx
+    SUBDIRS += fscommon
-SUBDIRS += fsxconfig
+}
-SUBDIRS += fs9
+contains(BLACK_CONFIG,FSX) {
-SUBDIRS += xplane
+    SUBDIRS += fsx
-SUBDIRS += xplaneconfig
+    SUBDIRS += fsxconfig
 }
 contains(BLACK_CONFIG,FS9) {
    SUBDIRS += fs9
 }
 contains(BLACK_CONFIG,XPlane) {
    SUBDIRS += xplane
    SUBDIRS += xplaneconfig
 }
 load(common_post)
--- a/src/plugins/simulator/xplane/xplane.pro
+++ b/src/plugins/simulator/xplane/xplane.pro
@@ -1,7 +1,5 @@
 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,7 +1,5 @@
 load(common_pre)
 REQUIRES += contains(BLACK_CONFIG,XPlane)
 QT       += core widgets dbus
 TARGET = simulatorxplaneconfig
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,15 +4,33 @@ TEMPLATE = subdirs
 CONFIG += ordered
 SUBDIRS += blackmisc
-SUBDIRS += blacksound
+contains(BLACK_CONFIG,BlackSound) {
-SUBDIRS += blackinput
+    SUBDIRS += blacksound
-SUBDIRS += blackcore
+}
-SUBDIRS += blackgui
+contains(BLACK_CONFIG,BlackInput) {
-SUBDIRS += swiftguistandard
+    SUBDIRS += blackinput
-SUBDIRS += swiftcore
+}
-SUBDIRS += swiftdata
+contains(BLACK_CONFIG,BlackCore) {
-SUBDIRS += swiftlauncher
+    SUBDIRS += blackcore
-SUBDIRS += xbus
+}
 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
 }
 SUBDIRS += plugins
 load(common_post)
--- a/src/swiftcore/swiftcore.pro
+++ b/src/swiftcore/swiftcore.pro
@@ -1,7 +1,5 @@
 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,7 +1,5 @@
 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,7 +1,5 @@
 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,7 +1,5 @@
 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,7 +1,5 @@
 load(common_pre)
 REQUIRES += contains(BLACK_CONFIG,XPlane)
 QT       += core gui widgets dbus network
 TEMPLATE = lib
--- a/swift.pro
+++ b/swift.pro
@@ -6,11 +6,17 @@ CONFIG += ordered
 OTHER_FILES += mkspecs/features/*.prf
 OTHER_FILES += mkspecs/features/*.pri
-SUBDIRS += docs
+contains(BLACK_CONFIG,Doxygen) {
    SUBDIRS += docs
 }
 SUBDIRS += resources
 SUBDIRS += src
-SUBDIRS += samples
+contains(BLACK_CONFIG,Samples) {
-SUBDIRS += tests
+    SUBDIRS += samples
 }
 contains(BLACK_CONFIG,Unittests) {
    SUBDIRS += tests
 }
 include(install.pri)
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,7 +1,5 @@
 load(common_pre)
 REQUIRES += contains(BLACK_CONFIG,Unittests)
 TEMPLATE = subdirs
 CONFIG += ordered