diff options
| author | Jules Blok <jules.blok@gmail.com> | 2016-11-01 18:32:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-01 18:32:12 +0100 |
| commit | 49ac577ac07b6b75de4cbe21737cf4bbd69b2bd2 (patch) | |
| tree | cf236c7065762016aabb72d369bc83e84766770b | |
| parent | 1c9ed79c6aeaccd13bf25c08764c33ae2cf73a01 (diff) | |
| parent | 04e262513cd3dd7718a6ee59758243ba19b37c8a (diff) | |
Merge pull request #4388 from ligfx/portaudio_static
CMake: build PortAudio as static library
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/Core/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 836cf698c2..8e4d33dccc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -569,9 +569,11 @@ if(NOT ANDROID) endif() if(SYSTEM_PORTAUDIO AND NOT APPLE) message("Using shared PortAudio for mic support") + set(PORTAUDIO_LIBRARIES portaudio) else() message("Using static PortAudio from Externals for mic support") add_subdirectory(Externals/portaudio) + set(PORTAUDIO_LIBRARIES portaudio_static) endif() endif() diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 21862dafdd..2a8d36d49f 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -274,7 +274,7 @@ if(HIDAPI_FOUND) endif(HIDAPI_FOUND) if(PORTAUDIO_FOUND) - set(LIBS ${LIBS} portaudio) + set(LIBS ${LIBS} ${PORTAUDIO_LIBRARIES}) endif(PORTAUDIO_FOUND) if(OPROFILE_FOUND) |