Use qmake $$files function to match wildcards

See https://bugreports.qt.io/browse/QTBUG-81003
This commit is contained in:
Mat Sutcliffe
2019-12-30 18:17:25 +00:00
parent dfdc468f9f
commit 1f0c65135d
8 changed files with 159 additions and 159 deletions

View File

@@ -4,35 +4,35 @@ TEMPLATE = lib
CONFIG += staticlib CONFIG += staticlib
CONFIG -= qt CONFIG -= qt
OTHER_FILES += share/images/flags/*.png OTHER_FILES += $$files($$PWD/share/images/flags/*.png)
OTHER_FILES += share/images/airlines/*.png OTHER_FILES += $$files($$PWD/share/images/airlines/*.png)
OTHER_FILES += share/html/*.* OTHER_FILES += $$files($$PWD/share/html/*.*)
OTHER_FILES += share/legal/*.* OTHER_FILES += $$files($$PWD/share/legal/*.*)
OTHER_FILES += share/test/*.* OTHER_FILES += $$files($$PWD/share/test/*.*)
OTHER_FILES += share/matchingscript/*.* OTHER_FILES += $$files($$PWD/share/matchingscript/*.*)
OTHER_FILES += share/simulator/swiftTerrainProbe/*.* OTHER_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/*.*)
OTHER_FILES += share/simulator/swiftTerrainProbe/model/*.* OTHER_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/model/*.*)
OTHER_FILES += share/simulator/swiftTerrainProbe/texture/*.* OTHER_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/texture/*.*)
OTHER_FILES += share/simulator/models/*.* OTHER_FILES += $$files($$PWD/share/simulator/models/*.*)
OTHER_FILES += shared/bootstrap/*.* OTHER_FILES += $$files($$PWD/shared/bootstrap/*.*)
OTHER_FILES += shared/dbdata/*.* OTHER_FILES += $$files($$PWD/shared/dbdata/*.*)
OTHER_FILES += shared/updateinfo/*.* OTHER_FILES += $$files($$PWD/shared/updateinfo/*.*)
COPY_FILES += $$PWD/share/images/flags/*.png COPY_FILES += $$files($$PWD/share/images/flags/*.png)
COPY_FILES += $$PWD/share/images/airlines/*.png COPY_FILES += $$files($$PWD/share/images/airlines/*.png)
COPY_FILES += $$PWD/share/html/*.* COPY_FILES += $$files($$PWD/share/html/*.*)
COPY_FILES += $$PWD/share/legal/*.* COPY_FILES += $$files($$PWD/share/legal/*.*)
COPY_FILES += $$PWD/share/test/*.* COPY_FILES += $$files($$PWD/share/test/*.*)
COPY_FILES += $$PWD/share/matchingscript/*.* COPY_FILES += $$files($$PWD/share/matchingscript/*.*)
COPY_FILES += $$PWD/share/misc/*.* COPY_FILES += $$files($$PWD/share/misc/*.*)
# COPY_FILES += $$PWD/share/simulator/*.* # COPY_FILES += $$files($$PWD/share/simulator/*.*)
COPY_FILES += $$PWD/share/simulator/swiftTerrainProbe/*.* COPY_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/*.*)
COPY_FILES += $$PWD/share/simulator/swiftTerrainProbe/model/*.* COPY_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/model/*.*)
COPY_FILES += $$PWD/share/simulator/swiftTerrainProbe/texture/*.* COPY_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/texture/*.*)
COPY_FILES += $$PWD/share/simulator/models/*.* COPY_FILES += $$files($$PWD/share/simulator/models/*.*)
COPY_FILES += $$PWD/share/shared/bootstrap/*.* COPY_FILES += $$files($$PWD/share/shared/bootstrap/*.*)
COPY_FILES += $$PWD/share/shared/dbdata/*.* COPY_FILES += $$files($$PWD/share/shared/dbdata/*.*)
COPY_FILES += $$PWD/share/shared/updateinfo/*.* COPY_FILES += $$files($$PWD/share/shared/updateinfo/*.*)
package_resources.path = $$PREFIX package_resources.path = $$PREFIX
package_resources.files += share package_resources.files += share

View File

@@ -21,31 +21,31 @@ INCLUDEPATH += pch
DEFINES += LOG_IN_FILE BUILD_BLACKCORE_LIB DEFINES += LOG_IN_FILE BUILD_BLACKCORE_LIB
HEADERS += *.h HEADERS += *.h
HEADERS += $$PWD/application/*.h HEADERS += $$files($$PWD/application/*.h)
HEADERS += $$PWD/audio/*.h HEADERS += $$files($$PWD/audio/*.h)
HEADERS += $$PWD/context/*.h HEADERS += $$files($$PWD/context/*.h)
HEADERS += $$PWD/data/*.h HEADERS += $$files($$PWD/data/*.h)
HEADERS += $$PWD/db/*.h HEADERS += $$files($$PWD/db/*.h)
HEADERS += $$PWD/vatsim/*.h HEADERS += $$files($$PWD/vatsim/*.h)
HEADERS += $$PWD/fsd/*.h HEADERS += $$files($$PWD/fsd/*.h)
HEADERS += $$PWD/afv/*.h HEADERS += $$files($$PWD/afv/*.h)
HEADERS += $$PWD/afv/audio/*.h HEADERS += $$files($$PWD/afv/audio/*.h)
HEADERS += $$PWD/afv/clients/*.h HEADERS += $$files($$PWD/afv/clients/*.h)
HEADERS += $$PWD/afv/crypto/*.h HEADERS += $$files($$PWD/afv/crypto/*.h)
HEADERS += $$PWD/afv/connection/*.h HEADERS += $$files($$PWD/afv/connection/*.h)
HEADERS += $$PWD/afv/model/*.h HEADERS += $$files($$PWD/afv/model/*.h)
SOURCES += *.cpp SOURCES += *.cpp
SOURCES += $$PWD/context/*.cpp SOURCES += $$files($$PWD/context/*.cpp)
SOURCES += $$PWD/data/*.cpp SOURCES += $$files($$PWD/data/*.cpp)
SOURCES += $$PWD/db/*.cpp SOURCES += $$files($$PWD/db/*.cpp)
SOURCES += $$PWD/vatsim/*.cpp SOURCES += $$files($$PWD/vatsim/*.cpp)
SOURCES += $$PWD/fsd/*.cpp SOURCES += $$files($$PWD/fsd/*.cpp)
SOURCES += $$PWD/afv/audio/*.cpp SOURCES += $$files($$PWD/afv/audio/*.cpp)
SOURCES += $$PWD/afv/clients/*.cpp SOURCES += $$files($$PWD/afv/clients/*.cpp)
SOURCES += $$PWD/afv/crypto/*.cpp SOURCES += $$files($$PWD/afv/crypto/*.cpp)
SOURCES += $$PWD/afv/connection/*.cpp SOURCES += $$files($$PWD/afv/connection/*.cpp)
SOURCES += $$PWD/afv/model/*.cpp SOURCES += $$files($$PWD/afv/model/*.cpp)
LIBS *= -lvatsimauth LIBS *= -lvatsimauth
LIBS *= -lsodium LIBS *= -lsodium

View File

@@ -34,37 +34,37 @@ DEFINES += LOG_IN_FILE BUILD_BLACKGUI_LIB QWT_DLL
HEADERS += *.h HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
HEADERS += $$PWD/models/*.h HEADERS += $$files($$PWD/models/*.h)
SOURCES += $$PWD/models/*.cpp SOURCES += $$files($$PWD/models/*.cpp)
HEADERS += $$PWD/menus/*.h HEADERS += $$files($$PWD/menus/*.h)
SOURCES += $$PWD/menus/*.cpp SOURCES += $$files($$PWD/menus/*.cpp)
HEADERS += $$PWD/views/*.h HEADERS += $$files($$PWD/views/*.h)
SOURCES += $$PWD/views/*.cpp SOURCES += $$files($$PWD/views/*.cpp)
FORMS += $$PWD/views/*.ui FORMS += $$files($$PWD/views/*.ui)
HEADERS += $$PWD/components/*.h HEADERS += $$files($$PWD/components/*.h)
HEADERS += $$PWD/settings/*.h HEADERS += $$files($$PWD/settings/*.h)
SOURCES += $$PWD/components/*.cpp SOURCES += $$files($$PWD/components/*.cpp)
SOURCES += $$PWD/settings/*.cpp SOURCES += $$files($$PWD/settings/*.cpp)
FORMS += $$PWD/components/*.ui FORMS += $$files($$PWD/components/*.ui)
HEADERS += $$PWD/filters/*.h HEADERS += $$files($$PWD/filters/*.h)
SOURCES += $$PWD/filters/*.cpp SOURCES += $$files($$PWD/filters/*.cpp)
FORMS += $$PWD/filters/*.ui FORMS += $$files($$PWD/filters/*.ui)
HEADERS += $$PWD/editors/*.h HEADERS += $$files($$PWD/editors/*.h)
SOURCES += $$PWD/editors/*.cpp SOURCES += $$files($$PWD/editors/*.cpp)
FORMS += $$PWD/editors/*.ui FORMS += $$files($$PWD/editors/*.ui)
HEADERS += $$PWD/graphs/*.h HEADERS += $$files($$PWD/graphs/*.h)
SOURCES += $$PWD/graphs/*.cpp SOURCES += $$files($$PWD/graphs/*.cpp)
FORMS += $$PWD/*.ui FORMS += $$files($$PWD/*.ui)
win32 { win32 {
HEADERS += $$PWD/win/*.h HEADERS += $$files($$PWD/win/*.h)
SOURCES += $$PWD/win/*.cpp SOURCES += $$files($$PWD/win/*.cpp)
} }
win32 { win32 {
@@ -84,8 +84,8 @@ DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$DestRoot/bin DLLDESTDIR = $$DestRoot/bin
OTHER_FILES += ./share/qss/*.qss ./share/qss/*.qss.in ./share/qss/*.css OTHER_FILES += ./share/qss/*.qss ./share/qss/*.qss.in ./share/qss/*.css
COPY_FILES += $$PWD/share/qss/*.qss COPY_FILES += $$files($$PWD/share/qss/*.qss)
COPY_FILES += $$PWD/share/qss/*.css COPY_FILES += $$files($$PWD/share/qss/*.css)
win32 { win32 {
dlltarget.path = $$PREFIX/bin dlltarget.path = $$PREFIX/bin

View File

@@ -20,8 +20,8 @@ HEADERS += *.h
SOURCES += *.cpp SOURCES += *.cpp
win32 { win32 {
HEADERS += $$PWD/win/*.h HEADERS += $$files($$PWD/win/*.h)
SOURCES += $$PWD/win/*.cpp SOURCES += $$files($$PWD/win/*.cpp)
DEFINES += DIRECTINPUT_VERSION=0x0800 DEFINES += DIRECTINPUT_VERSION=0x0800
@@ -29,13 +29,13 @@ win32 {
} }
unix:!macx { unix:!macx {
HEADERS += $$PWD/linux/*.h HEADERS += $$files($$PWD/linux/*.h)
SOURCES += $$PWD/linux/*.cpp SOURCES += $$files($$PWD/linux/*.cpp)
} }
macx { macx {
HEADERS += $$PWD/macos/*.h HEADERS += $$files($$PWD/macos/*.h)
OBJECTIVE_SOURCES += $$PWD/macos/*.mm OBJECTIVE_SOURCES += $$files($$PWD/macos/*.mm)
LIBS += -framework CoreFoundation -framework ApplicationServices -framework Foundation -framework AppKit LIBS += -framework CoreFoundation -framework ApplicationServices -framework Foundation -framework AppKit
} }

View File

@@ -26,55 +26,55 @@ TRANSLATIONS += translations/blackmisc_i18n_de.ts \
translations/blackmisc_i18n_en.ts translations/blackmisc_i18n_en.ts
HEADERS += *.h \ HEADERS += *.h \
$$PWD/audio/*.h \ $$files($$PWD/audio/*.h) \
# $$PWD/audio/settings/*.h \ # $$files($$PWD/audio/settings/*.h) \
$$PWD/aviation/*.h \ $$files($$PWD/aviation/*.h) \
$$PWD/db/*.h \ $$files($$PWD/db/*.h) \
$$PWD/geo/*.h \ $$files($$PWD/geo/*.h) \
$$PWD/input/*.h \ $$files($$PWD/input/*.h) \
$$PWD/math/*.h \ $$files($$PWD/math/*.h) \
$$PWD/network/*.h \ $$files($$PWD/network/*.h) \
$$PWD/network/data/*.h \ $$files($$PWD/network/data/*.h) \
$$PWD/network/settings/*.h \ $$files($$PWD/network/settings/*.h) \
$$PWD/network/external/*.h \ $$files($$PWD/network/external/*.h) \
$$PWD/pq/*.h \ $$files($$PWD/pq/*.h) \
$$PWD/simulation/*.h \ $$files($$PWD/simulation/*.h) \
$$PWD/simulation/data/*.h \ $$files($$PWD/simulation/data/*.h) \
$$PWD/simulation/settings/*.h \ $$files($$PWD/simulation/settings/*.h) \
$$PWD/simulation/flightgear/*.h \ $$files($$PWD/simulation/flightgear/*.h) \
$$PWD/simulation/fscommon/*.h \ $$files($$PWD/simulation/fscommon/*.h) \
$$PWD/simulation/fsx/*.h \ $$files($$PWD/simulation/fsx/*.h) \
$$PWD/simulation/xplane/*.h \ $$files($$PWD/simulation/xplane/*.h) \
$$PWD/thirdparty/*.h \ $$files($$PWD/thirdparty/*.h) \
$$PWD/test/*.h \ $$files($$PWD/test/*.h) \
$$PWD/weather/*.h \ $$files($$PWD/weather/*.h) \
SOURCES += *.cpp \ SOURCES += *.cpp \
$$PWD/audio/*.cpp \ $$files($$PWD/audio/*.cpp) \
# $$PWD/audio/settings/*.cpp \ # $$files($$PWD/audio/settings/*.cpp) \
$$PWD/aviation/*.cpp \ $$files($$PWD/aviation/*.cpp) \
$$PWD/db/*.cpp \ $$files($$PWD/db/*.cpp) \
$$PWD/geo/*.cpp \ $$files($$PWD/geo/*.cpp) \
$$PWD/input/*.cpp \ $$files($$PWD/input/*.cpp) \
$$PWD/math/*.cpp \ $$files($$PWD/math/*.cpp) \
$$PWD/network/*.cpp \ $$files($$PWD/network/*.cpp) \
$$PWD/network/settings/*.cpp \ $$files($$PWD/network/settings/*.cpp) \
$$PWD/network/external/*.cpp \ $$files($$PWD/network/external/*.cpp) \
$$PWD/pq/*.cpp \ $$files($$PWD/pq/*.cpp) \
$$PWD/simulation/*.cpp \ $$files($$PWD/simulation/*.cpp) \
$$PWD/simulation/data/*.cpp \ $$files($$PWD/simulation/data/*.cpp) \
$$PWD/simulation/settings/*.cpp \ $$files($$PWD/simulation/settings/*.cpp) \
$$PWD/simulation/flightgear/*.cpp \ $$files($$PWD/simulation/flightgear/*.cpp) \
$$PWD/simulation/fscommon/*.cpp \ $$files($$PWD/simulation/fscommon/*.cpp) \
$$PWD/simulation/fsx/*.cpp \ $$files($$PWD/simulation/fsx/*.cpp) \
$$PWD/simulation/xplane/*.cpp \ $$files($$PWD/simulation/xplane/*.cpp) \
$$PWD/thirdparty/*.cpp \ $$files($$PWD/thirdparty/*.cpp) \
$$PWD/test/*.cpp \ $$files($$PWD/test/*.cpp) \
$$PWD/weather/*.cpp \ $$files($$PWD/weather/*.cpp) \
macx { macx {
HEADERS += $$PWD/macos/microphoneaccess.h HEADERS += $$files($$PWD/macos/microphoneaccess.h)
OBJECTIVE_SOURCES += $$PWD/macos/microphoneaccess.mm OBJECTIVE_SOURCES += $$files($$PWD/macos/microphoneaccess.mm)
} }
INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad

View File

@@ -16,16 +16,16 @@ DEPENDPATH += . ..
DEFINES += LOG_IN_FILE BUILD_BLACKSOUND_LIB DEFINES += LOG_IN_FILE BUILD_BLACKSOUND_LIB
HEADERS += *.h HEADERS += *.h
HEADERS += $$PWD/wav/wavfile.h HEADERS += $$files($$PWD/wav/wavfile.h)
HEADERS += $$PWD/dsp/*.h HEADERS += $$files($$PWD/dsp/*.h)
HEADERS += $$PWD/codecs/*.h HEADERS += $$files($$PWD/codecs/*.h)
HEADERS += $$PWD/sampleprovider/*.h HEADERS += $$files($$PWD/sampleprovider/*.h)
SOURCES += *.cpp SOURCES += *.cpp
SOURCES += $$PWD/wav/wavfile.cpp SOURCES += $$files($$PWD/wav/wavfile.cpp)
SOURCES += $$PWD/dsp/*.cpp SOURCES += $$files($$PWD/dsp/*.cpp)
SOURCES += $$PWD/codecs/*.cpp SOURCES += $$files($$PWD/codecs/*.cpp)
SOURCES += $$PWD/sampleprovider/*.cpp SOURCES += $$files($$PWD/sampleprovider/*.cpp)
LIBS *= -lopus LIBS *= -lopus
@@ -33,7 +33,7 @@ DESTDIR = $$DestRoot/lib
DLLDESTDIR = $$DestRoot/bin DLLDESTDIR = $$DestRoot/bin
OTHER_FILES += ./share/sounds/*.wav ./share/sounds/readme.txt OTHER_FILES += ./share/sounds/*.wav ./share/sounds/readme.txt
COPY_FILES += $$PWD/share/sounds/* COPY_FILES += $$files($$PWD/share/sounds/*)
# RESOURCES += # RESOURCES +=
win32 { win32 {

View File

@@ -1,7 +1,7 @@
SOURCES += \ SOURCES += \
$$PWD/opusdecoder.cpp \ $$files($$PWD/codecs/opusdecoder.cpp) \
$$PWD/opusencoder.cpp \ $$files($$PWD/codecs/opusencoder.cpp) \
HEADERS += \ HEADERS += \
$$PWD/opusdecoder.h \ $$files($$PWD/codecs/opusdecoder.h) \
$$PWD/opusencoder.h \ $$files($$PWD/codecs/opusencoder.h) \

View File

@@ -1,22 +1,22 @@
SOURCES += \ SOURCES += \
$$PWD/bufferedwaveprovider.cpp \ $$files($$PWD/sampleprovider/bufferedwaveprovider.cpp) \
$$PWD/mixingsampleprovider.cpp \ $$files($$PWD/sampleprovider/mixingsampleprovider.cpp) \
$$PWD/equalizersampleprovider.cpp \ $$files($$PWD/sampleprovider/equalizersampleprovider.cpp) \
$$PWD/pinknoisegenerator.cpp \ $$files($$PWD/sampleprovider/pinknoisegenerator.cpp) \
$$PWD/resourcesound.cpp \ $$files($$PWD/sampleprovider/resourcesound.cpp) \
$$PWD/resourcesoundsampleprovider.cpp \ $$files($$PWD/sampleprovider/resourcesoundsampleprovider.cpp) \
$$PWD/samples.cpp \ $$files($$PWD/sampleprovider/samples.cpp) \
$$PWD/sawtoothgenerator.cpp \ $$files($$PWD/sampleprovider/sawtoothgenerator.cpp) \
$$PWD/simplecompressoreffect.cpp \ $$files($$PWD/sampleprovider/simplecompressoreffect.cpp) \
HEADERS += \ HEADERS += \
$$PWD/bufferedwaveprovider.h \ $$files($$PWD/sampleprovider/bufferedwaveprovider.h) \
$$PWD/mixingsampleprovider.h \ $$files($$PWD/sampleprovider/mixingsampleprovider.h) \
$$PWD/resourcesound.h \ $$files($$PWD/sampleprovider/resourcesound.h) \
$$PWD/resourcesoundsampleprovider.h \ $$files($$PWD/sampleprovider/resourcesoundsampleprovider.h) \
$$PWD/sampleprovider.h \ $$files($$PWD/sampleprovider/sampleprovider.h) \
$$PWD/equalizersampleprovider.h \ $$files($$PWD/sampleprovider/equalizersampleprovider.h) \
$$PWD/pinknoisegenerator.h \ $$files($$PWD/sampleprovider/pinknoisegenerator.h) \
$$PWD/samples.h \ $$files($$PWD/sampleprovider/samples.h) \
$$PWD/sawtoothgenerator.h \ $$files($$PWD/sampleprovider/sawtoothgenerator.h) \
$$PWD/simplecompressoreffect.h \ $$files($$PWD/sampleprovider/simplecompressoreffect.h) \