1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From: Sebastian Ramacher <sramacher@debian.org>
Date: Wed, 27 May 2020 00:42:35 +0200
Subject: cmake: use system portaudio
---
cmake-proxies/CMakeLists.txt | 2 +-
modules/mod-nyq-bench/CMakeLists.txt | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
index b8d981c..3bc6a87 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 4ba4807..86e2b4d 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}
)
|
