From af07d803fd741a0adc4b8503e975d0468ad04e17 Mon Sep 17 00:00:00 2001 From: TellowKrinkle Date: Fri, 23 Jul 2021 01:21:41 -0500 Subject: [PATCH] cmake: Enable features by checking targets Helpful for if targets are added as submodules in the future (hint: Windows builds) --- pcsx2/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pcsx2/CMakeLists.txt b/pcsx2/CMakeLists.txt index 6df94739a5..d2c20c8e07 100644 --- a/pcsx2/CMakeLists.txt +++ b/pcsx2/CMakeLists.txt @@ -47,12 +47,12 @@ elseif("${PGO}" STREQUAL "use") target_compile_options(PCSX2 PRIVATE -fprofile-use) endif() -if(PORTAUDIO_FOUND) +if(TARGET PkgConfig::PORTAUDIO) target_compile_definitions(PCSX2 PRIVATE SPU2X_PORTAUDIO) target_link_libraries(PCSX2 PRIVATE PkgConfig::PORTAUDIO) endif() -if(PULSEAUDIO_FOUND) +if(TARGET PulseAudio::PulseAudio) target_compile_definitions(PCSX2 PRIVATE SPU2X_PULSEAUDIO) target_link_libraries(PCSX2 PRIVATE PulseAudio::PulseAudio) endif() @@ -61,8 +61,9 @@ if(XDG_STD) target_compile_definitions(PCSX2 PRIVATE XDG_STD) endif() -if(SDL_FOUND OR SDL2_FOUND) +if(TARGET SDL::SDL) target_compile_definitions(PCSX2 PRIVATE SDL_BUILD) + target_link_libraries(PCSX2 PRIVATE SDL::SDL) endif() # Main pcsx2 source @@ -269,7 +270,7 @@ set(pcsx2SPU2Sources SPU2/wx/wxConfig.cpp ) -if(PORTAUDIO_FOUND) +if(TARGET PkgConfig::PORTAUDIO) list(APPEND pcsx2SPU2Sources SPU2/SndOut_Portaudio.cpp) endif() @@ -481,7 +482,7 @@ set(pcsx2USBHeaders USB/qemu-usb/input-keymap-linux-to-qcode.h ) -if(PULSEAUDIO_FOUND) +if(TARGET PulseAudio::PulseAudio) list(APPEND pcsx2USBSources USB/usb-mic/audiodev-pulse.cpp) list(APPEND pcsx2USBHeaders USB/usb-mic/audiodev-pulse.h) endif() @@ -1251,7 +1252,6 @@ target_link_libraries(PCSX2 PRIVATE HarfBuzz::HarfBuzz ZLIB::ZLIB PkgConfig::SOUNDTOUCH - SDL::SDL PCAP::PCAP PkgConfig::SAMPLERATE LibXml2::LibXml2