diff options
| author | Doris Verria <doris.verria@qt.io> | 2021-01-19 14:15:42 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-01-28 14:11:46 +0000 |
| commit | d4ab8c60a9ace4ca56d0babc7594fecaf17d9eab (patch) | |
| tree | de697ffae093630c4c2858f82be8968f6f0e5f6c /examples | |
| parent | 79b6a7e5df28c7b2dbbf1270ce2f5a6b3d184fac (diff) | |
Add find modules for 3rd party libraries and fix CMake files
Detect gstreamer, avfoundation, pulseaudio, alsa,
mmrenderer and wmf with cmake. Regenerate and adjust configure.cmake
and CMakeLists.txt files accordingly.
Change-Id: I550136909498d3870e0babd6294652774a718f64
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/multimedia/spectrum/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | examples/multimedia/spectrum/app/CMakeLists.txt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/multimedia/spectrum/CMakeLists.txt b/examples/multimedia/spectrum/CMakeLists.txt index 868c67f2b..5e0d8c45b 100644 --- a/examples/multimedia/spectrum/CMakeLists.txt +++ b/examples/multimedia/spectrum/CMakeLists.txt @@ -1,6 +1,6 @@ # Generated from spectrum.pro. add_subdirectory(app) -if(NOT DEFINES___contains___DISABLE_FFT) +if(BUILD_SHARED_LIBS) # special case add_subdirectory(3rdparty/fftreal) endif() diff --git a/examples/multimedia/spectrum/app/CMakeLists.txt b/examples/multimedia/spectrum/app/CMakeLists.txt index e55123afb..eda9884e5 100644 --- a/examples/multimedia/spectrum/app/CMakeLists.txt +++ b/examples/multimedia/spectrum/app/CMakeLists.txt @@ -74,7 +74,7 @@ qt6_add_resources(spectrum "spectrum" ${spectrum_resource_files} ) -if(MACOS AND NOT DEFINES___contains___DISABLE_FFT) +if(MACOS AND BUILD_SHARED_LIBS) # special case target_link_libraries(spectrum PUBLIC fftreal # special case # Remove: F @@ -82,7 +82,7 @@ if(MACOS AND NOT DEFINES___contains___DISABLE_FFT) endif() -if(NOT DEFINES___contains___DISABLE_FFT AND NOT MACOS) +if(BUILD_SHARED_LIBS AND NOT MACOS) # special case target_link_libraries(spectrum PUBLIC # Remove: L.. fftreal |