From: Sebastian Ramacher <sramacher@debian.org>
Date: Tue, 26 May 2020 22:42:35 +0000 (+0200)
Subject: cmake: use system portaudio
X-Git-Tag: archive/raspbian/3.6.3+dfsg-1+rpi1~1^2^2^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba933c38fc81ec306f2e04686aacb87447ad70bb;p=audacity.git

cmake: use system portaudio


Gbp-Pq: Name 0004-cmake-use-system-portaudio.patch
---

diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
index b8d981cc..3bc6a87f 100644
--- a/cmake-proxies/CMakeLists.txt
+++ b/cmake-proxies/CMakeLists.txt
@@ -132,7 +132,7 @@ addlib( expat              expat       EXPAT       YES   YES   "expat >= 2.1.0"
 addlib( lame               lame        LAME        YES   YES   "lame >= 3.100" )
 addlib( libsndfile         sndfile     SNDFILE     YES   YES   "sndfile >= 1.0.28" )
 addlib( libsoxr            soxr        SOXR        YES   YES   "soxr >= 0.1.1" )
-addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "" )
+addlib( portaudio-v19      portaudio   PORTAUDIO   YES   YES   "portaudio-2.0" )
 
 # Optional libraries
 #
diff --git a/modules/mod-nyq-bench/CMakeLists.txt b/modules/mod-nyq-bench/CMakeLists.txt
index 4ba4807e..86e2b4d8 100644
--- a/modules/mod-nyq-bench/CMakeLists.txt
+++ b/modules/mod-nyq-bench/CMakeLists.txt
@@ -15,12 +15,10 @@ list( APPEND SOURCES
 )
 
 get_target_property( wx_INCLUDES wxWidgets INTERFACE_INCLUDE_DIRECTORIES )
-get_target_property( pa_INCLUDES portaudio-v19 INTERFACE_INCLUDE_DIRECTORIES )
 get_target_property( ny_INCLUDES libnyquist INTERFACE_INCLUDE_DIRECTORIES )
 list( APPEND INCLUDES
    PUBLIC
       ${wx_INCLUDES}
-      ${pa_INCLUDES}
       ${ny_INCLUDES}
       ${TARGET_ROOT}
 )