From 5946eaf615f96c71ac98c891207aba97c6077e9f Mon Sep 17 00:00:00 2001
From: Bill Somerville <bill@classdesign.com>
Date: Wed, 14 Apr 2021 21:59:00 +0100
Subject: [PATCH] Windows compatibility for the portaudio package finder

---
 CMake/Modules/FindPortaudio.cmake | 10 +++++-----
 map65/CMakeLists.txt              |  5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CMake/Modules/FindPortaudio.cmake b/CMake/Modules/FindPortaudio.cmake
index 350b2285d..1dd2b127e 100644
--- a/CMake/Modules/FindPortaudio.cmake
+++ b/CMake/Modules/FindPortaudio.cmake
@@ -90,15 +90,15 @@ libfind_process (Portaudio)
 # fix up extra link libraries for macOS as target_link_libraries gets
 # it wrong for frameworks
 unset (_next_is_framework)
-unset (_portaudio_EXTRA_LIBS)
-foreach (_lib IN LISTS Portaudio_PKGCONF_LDFLAGS_OTHER)
+unset (_Portaudio_EXTRA_LIBS)
+foreach (_lib IN LISTS Portaudio_PKGCONF_LDFLAGS)
   if (_next_is_framework)
-    list (APPEND _portaudio_EXTRA_LIBS "-framework ${_lib}")
+    list (APPEND _Portaudio_EXTRA_LIBS "-framework ${_lib}")
     unset (_next_is_framework)
   elseif (${_lib} STREQUAL "-framework")
     set (_next_is_framework TRUE)
   else ()
-    list (APPEND _portaudio_EXTRA_LIBS ${_lib})
+    list (APPEND _Portaudio_EXTRA_LIBS ${_lib})
   endif ()
 endforeach ()
 
@@ -109,7 +109,7 @@ if (Portaudio_FOUND AND NOT TARGET Portaudio::Portaudio)
     IMPORTED_LOCATION "${Portaudio_LIBRARY}"
     INTERFACE_COMPILE_OPTIONS "${Portaudio_PKGCONF_CFLAGS_OTHER}"
     INTERFACE_INCLUDE_DIRECTORIES "${Portaudio_INCLUDE_DIRS}"
-    INTERFACE_LINK_LIBRARIES "${_portaudio_EXTRA_LIBS}"
+    INTERFACE_LINK_LIBRARIES "${_Portaudio_EXTRA_LIBS}"
     )
 endif ()
 
diff --git a/map65/CMakeLists.txt b/map65/CMakeLists.txt
index 29f52f88f..f5fd47e03 100644
--- a/map65/CMakeLists.txt
+++ b/map65/CMakeLists.txt
@@ -1,4 +1,4 @@
-find_package (portaudio REQUIRED)
+find_package (Portaudio REQUIRED)
 
 find_package (libusb REQUIRED)
 
@@ -57,8 +57,7 @@ add_subdirectory (libm65)
 qt5_wrap_ui (map65_GENUISRCS ${map65_UISRCS})
 
 add_executable (map65 ${map65_CXXSRCS} ${map65_CSRCS} ${map65_GENUISRCS} map65.rc)
-target_include_directories (map65 PRIVATE ${PORTAUDIO_INCLUDE_DIRS})
-target_link_libraries (map65 m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network portaudio::portaudio libusb::libusb)
+target_link_libraries (map65 m65impl ${FFTW3_LIBRARIES} Qt5::Widgets Qt5::Network Portaudio::Portaudio libusb::libusb)
 
 install (
   TARGETS map65