From: Nicholas Appleton Date: Sun, 2 Oct 2016 10:50:42 +0000 (+1100) Subject: replicate the library dependencies in the configure script X-Git-Tag: pa_stable_v190600_20161030~1^2 X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=refs%2Fheads%2Fcmake_mingw_fixes;p=portaudio replicate the library dependencies in the configure script --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 90770c9..789671a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -137,6 +137,8 @@ IF(WIN32) SET(PA_PRIVATE_INCLUDES ${PA_PRIVATE_INCLUDES} ${PA_PLATFORM_INCLUDES}) SET(PA_PRIVATE_INCLUDE_PATHS ${PA_PRIVATE_INCLUDE_PATHS} src/os/win) + SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} winmm) + # Try to find ASIO SDK (assumes that portaudio and asiosdk folders are side-by-side, see # http://www.portaudio.com/trac/wiki/TutorialDir/Compile/WindowsASIOMSVC) FIND_PACKAGE(ASIOSDK) @@ -156,7 +158,7 @@ IF(WIN32) SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_asio.h) SET(PA_SOURCES ${PA_SOURCES} ${PA_ASIO_SOURCES}) SET(PA_NON_UNICODE_SOURCES ${PA_NON_UNICODE_SOURCES} ${PA_ASIOSDK_SOURCES}) - SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} winmm ole32 uuid) + SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ole32 uuid) ELSE() # Set variables for DEF file expansion SET(DEF_EXCLUDE_ASIO_SYMBOLS ";") @@ -195,6 +197,7 @@ IF(WIN32) SOURCE_GROUP("hostapi\\wmme" FILES ${PA_WMME_SOURCES}) SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wmme.h) SET(PA_SOURCES ${PA_SOURCES} ${PA_WMME_SOURCES}) + SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ole32 uuid) ENDIF() IF(MSVS) @@ -209,6 +212,7 @@ IF(WIN32) SOURCE_GROUP("hostapi\\wasapi" FILES ${PA_WASAPI_SOURCES}) SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wasapi.h) SET(PA_SOURCES ${PA_SOURCES} ${PA_WASAPI_SOURCES}) + SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ole32 uuid) IF(NOT MSVC) SET(PA_PRIVATE_INCLUDE_PATHS ${PA_PRIVATE_INCLUDE_PATHS} src/hostapi/wasapi/mingw-include) ENDIF() @@ -222,8 +226,7 @@ IF(WIN32) SOURCE_GROUP("hostapi\\wdmks" FILES ${PA_WDMKS_SOURCES}) SET(PA_PUBLIC_INCLUDES ${PA_PUBLIC_INCLUDES} include/pa_win_wdmks.h) SET(PA_SOURCES ${PA_SOURCES} ${PA_WDMKS_SOURCES}) - # If we use WDM/KS we need setupapi.lib - SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} setupapi) + SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} setupapi ole32 uuid) ENDIF() OPTION(PA_USE_WDMKS_DEVICE_INFO "Use WDM/KS API for device info" ON)