From 62440f2f154d688467ac18d9360d5fa3a6d7bdbe Mon Sep 17 00:00:00 2001 From: ts-korhonen Date: Fri, 3 Dec 2021 16:01:32 +0200 Subject: [PATCH] Fix RtMidi linking errors --- src/qt/CMakeLists.txt | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt index 0e1193a69..032386152 100644 --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -102,25 +102,24 @@ target_link_libraries( Threads::Threads ) +if (PkgConfig_FOUND) + pkg_check_modules(RTMIDI rtmidi) + if (RTMIDI_FOUND) + target_include_directories(plat PRIVATE ${RTMIDI_INCLUDE_DIRS}) + target_link_directories(plat INTERFACE ${RTMIDI_LIBRARY_DIRS}) + target_link_libraries(plat PRIVATE ${RTMIDI_LIBRARIES}) + target_sources(plat PRIVATE rtmidi_midi.cpp) + else() + target_sources(plat PRIVATE qt_midi.cpp) + endif() +else() + target_sources(plat PRIVATE qt_midi.cpp) +endif() + if (UNIX AND NOT APPLE) find_package(X11 REQUIRED) target_link_libraries(ui PRIVATE X11::X11) find_package(ECM NO_MODULE) - if (PkgConfig_FOUND) - pkg_check_modules(RTMIDI rtmidi) - if (RTMIDI_FOUND) - target_include_directories(plat PRIVATE ${RTMIDI_INCLUDE_DIRS}) - target_link_directories(plat PRIVATE ${RTMIDI_LIBRARY_DIRS}) - target_link_libraries(plat PRIVATE ${RTMIDI_LIBRARIES}) - target_link_options(plat PRIVATE ${RTMIDI_LDFLAGS}) - target_compile_options(plat PRIVATE ${RTMIDI_CFLAGS}) - target_sources(plat PRIVATE rtmidi_midi.cpp) - else() - target_sources(plat PRIVATE qt_midi.cpp) - endif() - else() - target_sources(plat PRIVATE qt_midi.cpp) - endif() if (ECM_FOUND) list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) find_package(Wayland COMPONENTS Client)