80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #10 from Cacodemon345/patch-24

Browse Source 
Fix linker errors on macOS
This commit is contained in:
Joakim L. Gilje
2021-12-03 15:00:33 +01:00
committed by GitHub
parent e31a0349c5 0a10cd10d6
commit df5d4e6cb6
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/qt/CMakeLists.txt
View File

@@ -102,25 +102,25 @@ target_link_libraries(
Threads::Threads Threads::Threads
) )
if (UNIX AND NOT APPLE) if (PkgConfig_FOUND)
find_package(X11 REQUIRED) pkg_check_modules(RTMIDI rtmidi)
target_link_libraries(ui PRIVATE X11::X11) if (RTMIDI_FOUND)
find_package(ECM NO_MODULE) target_include_directories(plat PRIVATE ${RTMIDI_INCLUDE_DIRS})
if (PkgConfig_FOUND) target_link_directories(plat INTERFACE ${RTMIDI_LIBRARY_DIRS})
pkg_check_modules(RTMIDI rtmidi) target_link_libraries(plat PRIVATE ${RTMIDI_LIBRARIES})
if (RTMIDI_FOUND) target_sources(plat PRIVATE rtmidi_midi.cpp)
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() else()
target_sources(plat PRIVATE qt_midi.cpp) target_sources(plat PRIVATE qt_midi.cpp)
endif() 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 (ECM_FOUND) if (ECM_FOUND)
list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) list(APPEND CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
find_package(Wayland COMPONENTS Client) find_package(Wayland COMPONENTS Client)