diff options
79 files changed, 234 insertions, 191 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 651de3bb9..9fbc09604 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -90,6 +90,7 @@ SET(LIB_DIR "lib${LIB_SUFFIX}" CACHE STRING "library path") SET(PLUGIN_DIR "${LIB_DIR}/qmmp-${QMMP_VERSION_MAJOR}.${QMMP_VERSION_MINOR}" CACHE STRING "plugin path") SET(USE_SKINNED TRUE CACHE BOOL "enable/disable standard skinned user interface") SET(USE_DIR_ASSOC TRUE CACHE BOOL "enable/disable inode/directory mime type association") +#SET(APP_NAME_SUFFIX "-1") pkg_search_module(X11 x11) @@ -33,6 +33,8 @@ VERSIONS = $$split(QMMP_VERSION, ".") QMMP_VERSION_MAJOR = $$member(VERSIONS, 0) QMMP_VERSION_MINOR = $$member(VERSIONS, 1) +#APP_NAME_SUFFIX = "-1" + unix { isEmpty(PREFIX): PREFIX=/usr isEmpty(BIN_DIR): BIN_DIR=$$PREFIX/bin diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index 7736b85a2..f752e2483 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -31,16 +31,19 @@ QT5_ADD_RESOURCES(app_RCC_SRCS ${app_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_EXECUTABLE(qmmp ${app_SRCS} ${app_RCC_SRCS}) -target_link_libraries(qmmp Qt5::Widgets libqmmp qmmpui) -add_dependencies(qmmp qmmpui libqmmp) +target_link_libraries(qmmp Qt5::Widgets libqmmp libqmmpui) +SET_TARGET_PROPERTIES(qmmp PROPERTIES OUTPUT_NAME qmmp${APP_NAME_SUFFIX}) +add_dependencies(qmmp libqmmpui libqmmp) + install(TARGETS qmmp DESTINATION bin) install(FILES qmmp.desktop DESTINATION share/applications) -install(FILES images/16x16/qmmp.png DESTINATION share/icons/hicolor/16x16/apps) -install(FILES images/32x32/qmmp.png DESTINATION share/icons/hicolor/32x32/apps) -install(FILES images/48x48/qmmp.png DESTINATION share/icons/hicolor/48x48/apps) -install(FILES images/scalable/qmmp.svgz images/scalable/qmmp-simple.svgz DESTINATION share/icons/hicolor/scalable/apps) +install(FILES qmmp${APP_NAME_SUFFIX}.desktop DESTINATION share/applications) +install(FILES images/16x16/qmmp${APP_NAME_SUFFIX}.png DESTINATION share/icons/hicolor/16x16/apps) +install(FILES images/32x32/qmmp${APP_NAME_SUFFIX}.png DESTINATION share/icons/hicolor/32x32/apps) +install(FILES images/48x48/qmmp${APP_NAME_SUFFIX}.png DESTINATION share/icons/hicolor/48x48/apps) +install(FILES images/scalable/qmmp${APP_NAME_SUFFIX}.svgz images/scalable/qmmp-simple${APP_NAME_SUFFIX}.svgz DESTINATION share/icons/hicolor/scalable/apps) IF(USE_DIR_ASSOC) -install(FILES qmmp-enqueue.desktop DESTINATION share/applications) -install(FILES qmmp-dir.desktop DESTINATION share/applications) + install(FILES qmmp-enqueue${APP_NAME_SUFFIX}.desktop DESTINATION share/applications) + install(FILES qmmp-dir${APP_NAME_SUFFIX}.desktop DESTINATION share/applications) ENDIF(USE_DIR_ASSOC) diff --git a/src/app/app.pro b/src/app/app.pro index 9f4983167..9e9551591 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -2,7 +2,7 @@ include(../../qmmp.pri) TEMPLATE = app -unix:TARGET = ../../bin/qmmp +unix:TARGET = ../../bin/qmmp$$APP_NAME_SUFFIX win32:TARGET = ../../../bin/qmmp QT += network @@ -20,18 +20,18 @@ INCLUDEPATH += ../ unix { - LIBS += -lqmmp -lqmmpui + LIBS += -lqmmp$$APP_NAME_SUFFIX -lqmmpui$$APP_NAME_SUFFIX QMAKE_LIBDIR += ../../lib target.path = $$BIN_DIR - desktop.files = qmmp.desktop \ - qmmp-enqueue.desktop \ - qmmp-dir.desktop + desktop.files = qmmp$${APP_NAME_SUFFIX}.desktop \ + qmmp-enqueue$${APP_NAME_SUFFIX}.desktop \ + qmmp-dir$${APP_NAME_SUFFIX}.desktop desktop.path = $$DATA_DIR/applications - icon16.files = images/16x16/qmmp.png - icon32.files = images/32x32/qmmp.png - icon48.files = images/48x48/qmmp.png - icon_svg.files = images/scalable/qmmp.svgz \ - images/scalable/qmmp-simple.svgz + icon16.files = images/16x16/qmmp$${APP_NAME_SUFFIX}.png + icon32.files = images/32x32/qmmp$${APP_NAME_SUFFIX}.png + icon48.files = images/48x48/qmmp$${APP_NAME_SUFFIX}.png + icon_svg.files = images/scalable/qmmp$${APP_NAME_SUFFIX}.svgz \ + images/scalable/qmmp-simple$${APP_NAME_SUFFIX}.svgz icon16.path = $$DATA_DIR/icons/hicolor/16x16/apps icon32.path = $$DATA_DIR/icons/hicolor/32x32/apps icon48.path = $$DATA_DIR/icons/hicolor/48x48/apps diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt index 4ffacd19d..44642da1b 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt @@ -22,6 +22,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(incdecvolumeoption MODULE ${libincdecvolumeoption_SRCS} ${libincdecvolumeoption_RCC_SRCS}) -add_dependencies(incdecvolumeoption qmmpui) -target_link_libraries(incdecvolumeoption Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(incdecvolumeoption libqmmpui) +target_link_libraries(incdecvolumeoption Qt5::Widgets libqmmpui libqmmp) install(TARGETS incdecvolumeoption DESTINATION ${PLUGIN_DIR}/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt index 9ae4737c0..6fd9f47a0 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt @@ -22,6 +22,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(playlistoption MODULE ${libplaylistoption_SRCS} ${libplaylistoption_RCC_SRCS}) -add_dependencies(playlistoption qmmpui) -target_link_libraries(playlistoption Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(playlistoption libqmmpui) +target_link_libraries(playlistoption Qt5::Widgets libqmmpui libqmmp) install(TARGETS playlistoption DESTINATION ${PLUGIN_DIR}/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt index 768a3d194..3395484af 100644 --- a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt @@ -21,6 +21,6 @@ QT5_ADD_RESOURCES(seekoption_RCC_SRCS ${seekoption_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(seekoption MODULE ${seekoption_SRCS} ${seekoption_RCC_SRCS}) -add_dependencies(seekoption qmmpui) -target_link_libraries(seekoption Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(seekoption libqmmpui) +target_link_libraries(seekoption Qt5::Widgets libqmmpui libqmmp) install(TARGETS seekoption DESTINATION ${PLUGIN_DIR}/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt index 8f022f5cb..c28d07d85 100644 --- a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt @@ -21,6 +21,6 @@ QT5_ADD_RESOURCES(statusoption_RCC_SRCS ${statusoption_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(statusoption MODULE ${statusoption_SRCS} ${statusoption_RCC_SRCS}) -add_dependencies(statusoption qmmpui) -target_link_libraries(statusoption Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(statusoption libqmmpui) +target_link_libraries(statusoption Qt5::Widgets libqmmpui libqmmp) install(TARGETS statusoption DESTINATION ${PLUGIN_DIR}/CommandLineOptions) diff --git a/src/plugins/Effect/bs2b/CMakeLists.txt b/src/plugins/Effect/bs2b/CMakeLists.txt index 9d246092a..214cbb72d 100644 --- a/src/plugins/Effect/bs2b/CMakeLists.txt +++ b/src/plugins/Effect/bs2b/CMakeLists.txt @@ -40,7 +40,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(BS2B_FOUND) ADD_LIBRARY(bs2b MODULE ${libbs2b_SRCS} ${libbs2b_UIS_H} ${libbs2b_RCC_SRCS} ${libbs2b_HDRS}) -add_dependencies(bs2b qmmp) -target_link_libraries(bs2b Qt5::Widgets -lqmmp ${BS2B_LDFLAGS}) +add_dependencies(bs2b libqmmp) +target_link_libraries(bs2b Qt5::Widgets libqmmp ${BS2B_LDFLAGS}) install(TARGETS bs2b DESTINATION ${PLUGIN_DIR}/Effect) ENDIF(BS2B_FOUND) diff --git a/src/plugins/Effect/crossfade/CMakeLists.txt b/src/plugins/Effect/crossfade/CMakeLists.txt index 08d47e91e..0d9b1c62e 100644 --- a/src/plugins/Effect/crossfade/CMakeLists.txt +++ b/src/plugins/Effect/crossfade/CMakeLists.txt @@ -34,6 +34,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(crossfade MODULE ${libcrossfade_SRCS} ${libcrossfade_UIS_H} ${libcrossfade_RCC_SRCS} ${libcrossfade_HDRS}) -add_dependencies(crossfade qmmp) -target_link_libraries(crossfade Qt5::Widgets -lqmmp) +add_dependencies(crossfade libqmmp) +target_link_libraries(crossfade Qt5::Widgets libqmmp) install(TARGETS crossfade DESTINATION ${PLUGIN_DIR}/Effect) diff --git a/src/plugins/Effect/filewriter/CMakeLists.txt b/src/plugins/Effect/filewriter/CMakeLists.txt index a957b6e08..dc429996e 100644 --- a/src/plugins/Effect/filewriter/CMakeLists.txt +++ b/src/plugins/Effect/filewriter/CMakeLists.txt @@ -40,8 +40,8 @@ QT5_WRAP_UI(libfilewriter_UIS_H ${libfilewriter_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(VORBISENC_FOUND) -ADD_LIBRARY(filewriter MODULE ${libfilewriter_SRCS} ${libfilewriter_UIS_H} ${libfilewriter_RCC_SRCS} ${libfilewriter_HDRS}) -add_dependencies(filewriter qmmp qmmpui) -target_link_libraries(filewriter Qt5::Widgets -lqmmp -lqmmpui ${VORBISENC_LDFLAGS}) -install(TARGETS filewriter DESTINATION ${PLUGIN_DIR}/Effect) + ADD_LIBRARY(filewriter MODULE ${libfilewriter_SRCS} ${libfilewriter_UIS_H} ${libfilewriter_RCC_SRCS} ${libfilewriter_HDRS}) + add_dependencies(filewriter libqmmp libqmmpui) + target_link_libraries(filewriter Qt5::Widgets libqmmp libqmmpui ${VORBISENC_LDFLAGS}) + install(TARGETS filewriter DESTINATION ${PLUGIN_DIR}/Effect) ENDIF(VORBISENC_FOUND) diff --git a/src/plugins/Effect/ladspa/CMakeLists.txt b/src/plugins/Effect/ladspa/CMakeLists.txt index a5d46b7a6..b6e493c6d 100644 --- a/src/plugins/Effect/ladspa/CMakeLists.txt +++ b/src/plugins/Effect/ladspa/CMakeLists.txt @@ -36,7 +36,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(ladspa MODULE ${libladspa_SRCS} ${libladspa_UIS_H} ${libladspa_RCC_SRCS} ${libladspa_HDRS}) -add_dependencies(ladspa qmmp) -target_link_libraries(ladspa Qt5::Widgets -lqmmp ${CMAKE_DL_LIBS}) +add_dependencies(ladspa libqmmp) +target_link_libraries(ladspa Qt5::Widgets libqmmp ${CMAKE_DL_LIBS}) install(TARGETS ladspa DESTINATION ${PLUGIN_DIR}/Effect) diff --git a/src/plugins/Effect/soxr/CMakeLists.txt b/src/plugins/Effect/soxr/CMakeLists.txt index 82bd60fe4..a61a7e0c9 100644 --- a/src/plugins/Effect/soxr/CMakeLists.txt +++ b/src/plugins/Effect/soxr/CMakeLists.txt @@ -44,7 +44,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(SOXR_FOUND) ADD_LIBRARY(soxr MODULE ${libsoxr_SRCS} ${libsoxr_UIS_H} ${libsoxr_RCC_SRCS} ${libsoxr_HDRS}) -add_dependencies(soxr qmmp) -target_link_libraries(soxr Qt5::Widgets -lqmmp ${SOXR_LDFLAGS}) +add_dependencies(soxr libqmmp) +target_link_libraries(soxr Qt5::Widgets libqmmp ${SOXR_LDFLAGS}) install(TARGETS soxr DESTINATION ${PLUGIN_DIR}/Effect) ENDIF(SOXR_FOUND) diff --git a/src/plugins/Effect/stereo/CMakeLists.txt b/src/plugins/Effect/stereo/CMakeLists.txt index a4c4d4f49..5ed7c3a6b 100644 --- a/src/plugins/Effect/stereo/CMakeLists.txt +++ b/src/plugins/Effect/stereo/CMakeLists.txt @@ -33,6 +33,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(stereo MODULE ${libstereo_SRCS} ${libstereo_UIS_H} ${libstereo_RCC_SRCS} ${libstereo_HDRS}) -add_dependencies(stereo qmmp) -target_link_libraries(stereo Qt5::Widgets -lqmmp) +add_dependencies(stereo libqmmp) +target_link_libraries(stereo Qt5::Widgets libqmmp) install(TARGETS stereo DESTINATION ${PLUGIN_DIR}/Effect) diff --git a/src/plugins/Engines/mplayer/CMakeLists.txt b/src/plugins/Engines/mplayer/CMakeLists.txt index 1120b6b91..dee19f4fd 100644 --- a/src/plugins/Engines/mplayer/CMakeLists.txt +++ b/src/plugins/Engines/mplayer/CMakeLists.txt @@ -31,7 +31,7 @@ QT5_WRAP_UI(libmplayer_UIS_H ${libmplayer_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(mplayer MODULE ${libmplayer_SRCS} ${libmplayer_RCC_SRCS} ${libmplayer_UIS_H}) -add_dependencies(mplayer qmmp) -target_link_libraries(mplayer Qt5::Widgets -lqmmp) +add_dependencies(mplayer libqmmp) +target_link_libraries(mplayer Qt5::Widgets libqmmp) install(TARGETS mplayer DESTINATION ${PLUGIN_DIR}/Engines) diff --git a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt index 9723f249f..1954fb3fb 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt +++ b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt @@ -30,6 +30,6 @@ QT5_WRAP_UI(libqmmpfiledialog_UIS_H ${libqmmpfiledialog_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(qmmpfiledialog MODULE ${libqmmpfiledialog_SRCS} ${libqmmpfiledialog_UIS_H} ${libqmmpfiledialog_RCC_SRCS}) -add_dependencies(qmmpfiledialog qmmpui) -target_link_libraries(qmmpfiledialog Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(qmmpfiledialog libqmmpui) +target_link_libraries(qmmpfiledialog Qt5::Widgets libqmmpui libqmmp) install(TARGETS qmmpfiledialog DESTINATION ${PLUGIN_DIR}/FileDialogs) diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt b/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt index faf1d2473..b86b7e492 100644 --- a/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt +++ b/src/plugins/FileDialogs/TwoPanelFileDialog/CMakeLists.txt @@ -30,6 +30,6 @@ QT5_WRAP_UI(libtwopanelfiledialog_UIS_H ${libtwopanelfiledialog_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(twopanelfiledialog MODULE ${libtwopanelfiledialog_SRCS} ${libtwopanelfiledialog_UIS_H} ${libtwopanelfiledialog_RCC_SRCS}) -add_dependencies(twopanelfiledialog qmmpui) -target_link_libraries(twopanelfiledialog Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(twopanelfiledialog libqmmpui) +target_link_libraries(twopanelfiledialog Qt5::Widgets libqmmpui libqmmp) install(TARGETS twopanelfiledialog DESTINATION ${PLUGIN_DIR}/FileDialogs) diff --git a/src/plugins/General/converter/CMakeLists.txt b/src/plugins/General/converter/CMakeLists.txt index 7a3c1dec0..65bb35c64 100644 --- a/src/plugins/General/converter/CMakeLists.txt +++ b/src/plugins/General/converter/CMakeLists.txt @@ -39,6 +39,6 @@ QT5_WRAP_UI(libconverter_UIS_H ${libconverter_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(converter MODULE ${libconverter_SRCS} ${libconverter_UIS_H} ${libconverter_RCC_SRCS}) -add_dependencies(converter qmmpui) -target_link_libraries(converter Qt5::Widgets -lqmmpui -lqmmp ${TAGLIB_LDFLAGS}) +add_dependencies(converter libqmmpui) +target_link_libraries(converter Qt5::Widgets libqmmpui libqmmp ${TAGLIB_LDFLAGS}) install(TARGETS converter DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/copypaste/CMakeLists.txt b/src/plugins/General/copypaste/CMakeLists.txt index 854f797fd..4a55a1d25 100644 --- a/src/plugins/General/copypaste/CMakeLists.txt +++ b/src/plugins/General/copypaste/CMakeLists.txt @@ -22,6 +22,6 @@ QT5_ADD_RESOURCES(libcopypaste_RCC_SRCS ${libcopypaste_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(copypaste MODULE ${libcopypaste_SRCS} ${libcopypaste_UIS_H} ${libcopypaste_RCC_SRCS}) -add_dependencies(copypaste qmmpui) -target_link_libraries(copypaste Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(copypaste libqmmpui) +target_link_libraries(copypaste Qt5::Widgets libqmmpui libqmmp) install(TARGETS copypaste DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/covermanager/CMakeLists.txt b/src/plugins/General/covermanager/CMakeLists.txt index 97a938991..4e36aec32 100644 --- a/src/plugins/General/covermanager/CMakeLists.txt +++ b/src/plugins/General/covermanager/CMakeLists.txt @@ -35,6 +35,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(covermanager MODULE ${libcovermanager_SRCS} ${libcovermanager_UIS_H} ${libcovermanager_RCC_SRCS}) -add_dependencies(covermanager qmmpui) -target_link_libraries(covermanager Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(covermanager libqmmpui) +target_link_libraries(covermanager Qt5::Widgets libqmmpui libqmmp) install(TARGETS covermanager DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/fileops/CMakeLists.txt b/src/plugins/General/fileops/CMakeLists.txt index 3bb97ecfa..287ad079a 100644 --- a/src/plugins/General/fileops/CMakeLists.txt +++ b/src/plugins/General/fileops/CMakeLists.txt @@ -32,6 +32,6 @@ QT5_WRAP_UI(libfileops_UIS_H ${libfileops_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(fileops MODULE ${libfileops_SRCS} ${libfileops_UIS_H} ${libfileops_RCC_SRCS}) -add_dependencies(fileops qmmpui) -target_link_libraries(fileops Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(fileops libqmmpui) +target_link_libraries(fileops Qt5::Widgets libqmmpui libqmmp) install(TARGETS fileops DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/gnomehotkey/CMakeLists.txt b/src/plugins/General/gnomehotkey/CMakeLists.txt index 45c774c71..e4b43def9 100644 --- a/src/plugins/General/gnomehotkey/CMakeLists.txt +++ b/src/plugins/General/gnomehotkey/CMakeLists.txt @@ -21,6 +21,6 @@ QT5_ADD_RESOURCES(libgnomehotkey_RCC_SRCS ${libgnomehotkey_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(gnomehotkey MODULE ${libgnomehotkey_SRCS} ${libgnomehotkey_RCC_SRCS}) -add_dependencies(gnomehotkey qmmpui) -target_link_libraries(gnomehotkey Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) +add_dependencies(gnomehotkey libqmmpui) +target_link_libraries(gnomehotkey Qt5::Widgets Qt5::DBus libqmmpui libqmmp) install(TARGETS gnomehotkey DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/hal/CMakeLists.txt b/src/plugins/General/hal/CMakeLists.txt index 0216c65fb..46041b541 100644 --- a/src/plugins/General/hal/CMakeLists.txt +++ b/src/plugins/General/hal/CMakeLists.txt @@ -31,6 +31,6 @@ QT5_WRAP_UI(libhal_UIS_H ${libhal_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(hal MODULE ${libhal_SRCS} ${libhal_UIS_H} ${libhal_RCC_SRCS}) -add_dependencies(hal qmmpui) -target_link_libraries(hal Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) +add_dependencies(hal libqmmpui) +target_link_libraries(hal Qt5::Widgets Qt5::DBus libqmmpui libqmmp) install(TARGETS hal DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt index 99651e4a1..46d7d1a5e 100644 --- a/src/plugins/General/hotkey/CMakeLists.txt +++ b/src/plugins/General/hotkey/CMakeLists.txt @@ -49,7 +49,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(X11_FOUND) set_property(SOURCE hotkeymanager_x11.cpp PROPERTY SKIP_AUTOMOC ON) ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS}) -add_dependencies(hotkey qmmpui) -target_link_libraries(hotkey Qt5::Widgets Qt5::X11Extras -lqmmpui -lqmmp ${X11_LDFLAGS}) +add_dependencies(hotkey libqmmpui) +target_link_libraries(hotkey Qt5::Widgets Qt5::X11Extras libqmmpui libqmmp ${X11_LDFLAGS}) install(TARGETS hotkey DESTINATION ${PLUGIN_DIR}/General) ENDIF(X11_FOUND) diff --git a/src/plugins/General/kdenotify/CMakeLists.txt b/src/plugins/General/kdenotify/CMakeLists.txt index edee34992..c61cb35cc 100644 --- a/src/plugins/General/kdenotify/CMakeLists.txt +++ b/src/plugins/General/kdenotify/CMakeLists.txt @@ -7,6 +7,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmpui) link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../../qmmp) +SET(libkdenotify_DEFINES APP_NAME_SUFFIX="${APP_NAME_SUFFIX}") + SET(libkdenotify_SRCS kdenotify.cpp kdenotifyfactory.cpp @@ -30,8 +32,9 @@ QT5_WRAP_UI(libkdenotify_UIS_H ${libkdenotify_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(kdenotify MODULE ${libkdenotify_SRCS} ${libkdenotify_RCC_SRCS} ${libkdenotify_UIS_H}) -add_dependencies(kdenotify qmmpui) -target_link_libraries(kdenotify Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) +SET_TARGET_PROPERTIES(kdenotify PROPERTIES COMPILE_DEFINITIONS "${libkdenotify_DEFINES}") +add_dependencies(kdenotify libqmmpui) +target_link_libraries(kdenotify Qt5::Widgets Qt5::DBus libqmmpui libqmmp) install(TARGETS kdenotify DESTINATION ${PLUGIN_DIR}/General) -install(FILES images/empty_cover.png DESTINATION share/qmmp/images) -install(FILES images/app_icon.png DESTINATION share/qmmp/images) +install(FILES images/empty_cover.png DESTINATION share/qmmp${APP_NAME_SUFFIX}/images) +install(FILES images/app_icon.png DESTINATION share/qmmp${APP_NAME_SUFFIX}/images) diff --git a/src/plugins/General/kdenotify/kdenotify.cpp b/src/plugins/General/kdenotify/kdenotify.cpp index 70dfa1489..b48cf4b0f 100644 --- a/src/plugins/General/kdenotify/kdenotify.cpp +++ b/src/plugins/General/kdenotify/kdenotify.cpp @@ -60,7 +60,7 @@ KdeNotify::KdeNotify(QObject *parent) : QObject(parent),m_useFreedesktopSpec(fal dir.mkdir("kdenotifycache"); dir.cd("kdenotifycache"); m_coverPath = dir.absolutePath() + "/cover.jpg"; - m_imagesDir = QDir(qApp->applicationFilePath () +"/../../share/qmmp/images").absolutePath(); + m_imagesDir = QDir(qApp->applicationFilePath () + "/../../share/qmmp" APP_NAME_SUFFIX "/images").absolutePath(); QSettings settings(Qmmp::configFile(),QSettings::IniFormat); settings.beginGroup("Kde_Notifier"); diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro index dcc7d7a62..1e8261633 100644 --- a/src/plugins/General/kdenotify/kdenotify.pro +++ b/src/plugins/General/kdenotify/kdenotify.pro @@ -7,6 +7,8 @@ TARGET = $$PLUGINS_PREFIX/General/kdenotify QT += dbus +DEFINES += APP_NAME_SUFFIX=\\\"$$APP_NAME_SUFFIX\\\" + SOURCES += kdenotifyfactory.cpp \ kdenotify.cpp \ settingsdialog.cpp @@ -24,5 +26,5 @@ LIBS += $$QMMPUI_LIB target.path = $$PLUGIN_DIR/General images.files = images/app_icon.png \ images/empty_cover.png -images.path = $$DATA_DIR/qmmp/images/ +images.path = $$DATA_DIR/qmmp$${APP_NAME_SUFFIX}/images/ INSTALLS += target images diff --git a/src/plugins/General/lyrics/CMakeLists.txt b/src/plugins/General/lyrics/CMakeLists.txt index 1c88942d2..206404458 100644 --- a/src/plugins/General/lyrics/CMakeLists.txt +++ b/src/plugins/General/lyrics/CMakeLists.txt @@ -30,6 +30,6 @@ QT5_WRAP_UI(liblyrics_UIS_H ${liblyrics_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(lyrics MODULE ${liblyrics_SRCS} ${liblyrics_UIS_H} ${liblyrics_RCC_SRCS}) -add_dependencies(lyrics qmmpui) -target_link_libraries(lyrics Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) +add_dependencies(lyrics libqmmpui) +target_link_libraries(lyrics Qt5::Widgets Qt5::Network libqmmpui libqmmp) install(TARGETS lyrics DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/mpris/CMakeLists.txt b/src/plugins/General/mpris/CMakeLists.txt index 76f525777..5d63a16df 100644 --- a/src/plugins/General/mpris/CMakeLists.txt +++ b/src/plugins/General/mpris/CMakeLists.txt @@ -30,6 +30,6 @@ QT5_ADD_RESOURCES(libmpris_RCC_SRCS ${libmpris_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(mpris MODULE ${libmpris_SRCS} ${libmpris_RCC_SRCS}) -add_dependencies(mpris qmmpui) -target_link_libraries(mpris Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) +add_dependencies(mpris libqmmpui) +target_link_libraries(mpris Qt5::Widgets Qt5::DBus libqmmpui libqmmp) install(TARGETS mpris DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt index b4a75a259..239432af2 100644 --- a/src/plugins/General/notifier/CMakeLists.txt +++ b/src/plugins/General/notifier/CMakeLists.txt @@ -33,14 +33,14 @@ QT5_WRAP_UI(libnotifier_UIS_H ${libnotifier_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(notifier MODULE ${libnotifier_SRCS} ${libnotifier_UIS_H} ${libnotifier_RCC_SRCS}) -add_dependencies(notifier qmmpui) +add_dependencies(notifier libqmmpui) IF(X11_FOUND AND Qt5X11Extras_FOUND) include_directories(${X11_INCLUDE_DIRS}) link_directories(${X11_LIBRARY_DIRS}) ADD_DEFINITIONS(${X11_CFLAGS}) ADD_DEFINITIONS(-DX11_FOUND) - target_link_libraries(notifier Qt5::X11Extras Qt5::Widgets ${X11_LDFLAGS} -lqmmpui -lqmmp) + target_link_libraries(notifier Qt5::X11Extras Qt5::Widgets ${X11_LDFLAGS} libqmmpui libqmmp) ELSE(X11_FOUND AND Qt5X11Extras_FOUND) - target_link_libraries(notifier Qt5::Widgets -lqmmpui -lqmmp) + target_link_libraries(notifier Qt5::Widgets libqmmpui libqmmp) ENDIF(X11_FOUND AND Qt5X11Extras_FOUND) install(TARGETS notifier DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/rgscan/CMakeLists.txt b/src/plugins/General/rgscan/CMakeLists.txt index bcba1daed..2411fd4d4 100644 --- a/src/plugins/General/rgscan/CMakeLists.txt +++ b/src/plugins/General/rgscan/CMakeLists.txt @@ -43,6 +43,6 @@ QT5_WRAP_UI(librgscan_UIS_H ${librgscan_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(rgscan MODULE ${librgscan_SRCS} ${librgscan_UIS_H} ${librgscan_HDRS} ${librgscan_RCC_SRCS}) -add_dependencies(rgscan qmmpui) -target_link_libraries(rgscan Qt5::Widgets -lqmmpui -lqmmp ${TAGLIB_LDFLAGS}) +add_dependencies(rgscan libqmmpui) +target_link_libraries(rgscan Qt5::Widgets libqmmpui libqmmp ${TAGLIB_LDFLAGS}) install(TARGETS rgscan DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/scrobbler/CMakeLists.txt b/src/plugins/General/scrobbler/CMakeLists.txt index 1117faba2..c4b481050 100644 --- a/src/plugins/General/scrobbler/CMakeLists.txt +++ b/src/plugins/General/scrobbler/CMakeLists.txt @@ -39,6 +39,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(scrobbler MODULE ${libscrobbler_SRCS} ${libscrobbler_UIS_H} ${libscrobbler_RCC_SRCS} ${libscrobbler_HDRS}) -add_dependencies(scrobbler qmmpui) -target_link_libraries(scrobbler Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) +add_dependencies(scrobbler libqmmpui) +target_link_libraries(scrobbler Qt5::Widgets Qt5::Network libqmmpui libqmmp) install(TARGETS scrobbler DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt index d52c081fa..dd609d094 100644 --- a/src/plugins/General/statusicon/CMakeLists.txt +++ b/src/plugins/General/statusicon/CMakeLists.txt @@ -35,6 +35,6 @@ QT5_WRAP_UI(libstatusicon_UIS_H ${libstatusicon_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(statusicon MODULE ${libstatusicon_SRCS} ${libstatusicon_UIS_H} ${libstatusicon_RCC_SRCS}) -add_dependencies(statusicon qmmpui libqmmp) -target_link_libraries(statusicon Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(statusicon libqmmpui libqmmp) +target_link_libraries(statusicon Qt5::Widgets libqmmpui libqmmp) install(TARGETS statusicon DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/streambrowser/CMakeLists.txt b/src/plugins/General/streambrowser/CMakeLists.txt index 2c4c156ea..380880d2f 100644 --- a/src/plugins/General/streambrowser/CMakeLists.txt +++ b/src/plugins/General/streambrowser/CMakeLists.txt @@ -30,6 +30,6 @@ QT5_WRAP_UI(libstreambrowser_UIS_H ${libstreambrowser_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(streambrowser MODULE ${libstreambrowser_SRCS} ${libstreambrowser_UIS_H} ${libstreambrowser_RCC_SRCS}) -add_dependencies(streambrowser qmmpui) -target_link_libraries(streambrowser Qt5::Widgets Qt5::Network -lqmmpui -lqmmp) +add_dependencies(streambrowser libqmmpui) +target_link_libraries(streambrowser Qt5::Widgets Qt5::Network libqmmpui libqmmp) install(TARGETS streambrowser DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/trackchange/CMakeLists.txt b/src/plugins/General/trackchange/CMakeLists.txt index e5ebdec84..5fef9664f 100644 --- a/src/plugins/General/trackchange/CMakeLists.txt +++ b/src/plugins/General/trackchange/CMakeLists.txt @@ -29,6 +29,6 @@ QT5_WRAP_UI(libtrackchange_UIS_H ${libtrackchange_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(trackchange MODULE ${libtrackchange_SRCS} ${libtrackchange_UIS_H} ${libtrackchange_RCC_SRCS}) -add_dependencies(trackchange qmmpui) -target_link_libraries(trackchange Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(trackchange libqmmpui) +target_link_libraries(trackchange Qt5::Widgets libqmmpui libqmmp) install(TARGETS trackchange DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/General/udisks2/CMakeLists.txt b/src/plugins/General/udisks2/CMakeLists.txt index 5a7819934..c767c824d 100644 --- a/src/plugins/General/udisks2/CMakeLists.txt +++ b/src/plugins/General/udisks2/CMakeLists.txt @@ -31,6 +31,6 @@ QT5_WRAP_UI(libudisks2_UIS_H ${libudisks2_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(udisks2 MODULE ${libudisks2_SRCS} ${libudisks2_UIS_H} ${libudisks2_RCC_SRCS}) -add_dependencies(udisks2 qmmpui) -target_link_libraries(udisks2 Qt5::Widgets Qt5::DBus -lqmmpui -lqmmp) +add_dependencies(udisks2 libqmmpui) +target_link_libraries(udisks2 Qt5::Widgets Qt5::DBus libqmmpui libqmmp) install(TARGETS udisks2 DESTINATION ${PLUGIN_DIR}/General) diff --git a/src/plugins/Input/aac/CMakeLists.txt b/src/plugins/Input/aac/CMakeLists.txt index 21f0e4967..d861832cc 100644 --- a/src/plugins/Input/aac/CMakeLists.txt +++ b/src/plugins/Input/aac/CMakeLists.txt @@ -66,7 +66,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FAAD_FOUND) ADD_LIBRARY(aac MODULE ${libaac_SRCS} ${libaac_RCC_SRCS} ${libaac_HDRS}) -add_dependencies(aac qmmp) -target_link_libraries(aac Qt5::Widgets -lqmmp -lfaad ${TAGLIB_LDFLAGS}) +add_dependencies(aac libqmmp) +target_link_libraries(aac Qt5::Widgets libqmmp -lfaad ${TAGLIB_LDFLAGS}) install(TARGETS aac DESTINATION ${PLUGIN_DIR}/Input) ENDIF(FAAD_FOUND) diff --git a/src/plugins/Input/archive/CMakeLists.txt b/src/plugins/Input/archive/CMakeLists.txt index cfa4a5891..e81f05466 100644 --- a/src/plugins/Input/archive/CMakeLists.txt +++ b/src/plugins/Input/archive/CMakeLists.txt @@ -34,7 +34,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(LIBARCHIVE_FOUND) ADD_LIBRARY(archive MODULE ${libarchive_SRCS} ${libarchive_RCC_SRCS} ${libarchive_HDRS}) -add_dependencies(archive qmmp) +add_dependencies(archive libqmmp) target_link_libraries(archive Qt5::Widgets libqmmp ${LIBARCHIVE_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS archive DESTINATION ${PLUGIN_DIR}/Input) ENDIF(LIBARCHIVE_FOUND) diff --git a/src/plugins/Input/cdaudio/CMakeLists.txt b/src/plugins/Input/cdaudio/CMakeLists.txt index 734c95ede..efdaedd87 100644 --- a/src/plugins/Input/cdaudio/CMakeLists.txt +++ b/src/plugins/Input/cdaudio/CMakeLists.txt @@ -41,7 +41,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(CDIO_FOUND) ADD_LIBRARY(cdaudio MODULE ${libcdaudio_SRCS} ${libcdaudio_UIS_H} ${libcdaudio_RCC_SRCS} ${libcdaudio_HDRS}) -add_dependencies(cdaudio qmmp) -target_link_libraries(cdaudio Qt5::Widgets -lqmmp ${CDIO_LDFLAGS}) +add_dependencies(cdaudio libqmmp) +target_link_libraries(cdaudio Qt5::Widgets libqmmp ${CDIO_LDFLAGS}) install(TARGETS cdaudio DESTINATION ${PLUGIN_DIR}/Input) ENDIF(CDIO_FOUND) diff --git a/src/plugins/Input/cue/CMakeLists.txt b/src/plugins/Input/cue/CMakeLists.txt index c053cc6eb..07e2bfc4c 100644 --- a/src/plugins/Input/cue/CMakeLists.txt +++ b/src/plugins/Input/cue/CMakeLists.txt @@ -43,10 +43,10 @@ QT5_WRAP_UI(libcue_UIS_H ${libcue_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(cue MODULE ${libcue_SRCS} ${libcue_RCC_SRCS} ${libcue_UIS_H} ${libcue_HDRS}) -add_dependencies(cue qmmp) +add_dependencies(cue libqmmp) IF(USE_ENCA AND ENCA_FOUND) -target_link_libraries(cue Qt5::Widgets -lqmmp ${ENCA_LDFLAGS}) +target_link_libraries(cue Qt5::Widgets libqmmp ${ENCA_LDFLAGS}) ELSE(USE_ENCA AND ENCA_FOUND) -target_link_libraries(cue Qt5::Widgets -lqmmp) +target_link_libraries(cue Qt5::Widgets libqmmp) ENDIF(USE_ENCA AND ENCA_FOUND) install(TARGETS cue DESTINATION ${PLUGIN_DIR}/Input) diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index d46a3386f..50bfa3d2e 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -49,7 +49,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FFMPEG_FOUND) ADD_LIBRARY(ffmpeg MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS}) -add_dependencies(ffmpeg qmmp) -target_link_libraries(ffmpeg Qt5::Widgets -lqmmp ${FFMPEG_LDFLAGS}) +add_dependencies(ffmpeg libqmmp) +target_link_libraries(ffmpeg Qt5::Widgets libqmmp ${FFMPEG_LDFLAGS}) install(TARGETS ffmpeg DESTINATION ${PLUGIN_DIR}/Input) ENDIF(FFMPEG_FOUND) diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt index f9d36369a..6867ba9bb 100644 --- a/src/plugins/Input/flac/CMakeLists.txt +++ b/src/plugins/Input/flac/CMakeLists.txt @@ -40,7 +40,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(FLAC_FOUND) ADD_LIBRARY(flac MODULE ${libflac_SRCS} ${libflac_RCC_SRCS} ${libflac_HDRS}) -add_dependencies(flac qmmp) -target_link_libraries(flac Qt5::Widgets -lqmmp ${FLAC_LDFLAGS} ${TAGLIB_LDFLAGS}) +add_dependencies(flac libqmmp) +target_link_libraries(flac Qt5::Widgets libqmmp ${FLAC_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS flac DESTINATION ${PLUGIN_DIR}/Input) ENDIF(FLAC_FOUND) diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt index f6cb13f55..0134f7300 100644 --- a/src/plugins/Input/gme/CMakeLists.txt +++ b/src/plugins/Input/gme/CMakeLists.txt @@ -50,7 +50,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(GME_FOUND) ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS} ${libgme_UIS_H}) -add_dependencies(gme qmmp) -target_link_libraries(gme Qt5::Widgets -lqmmp ${GME_LIB}) +add_dependencies(gme libqmmp) +target_link_libraries(gme Qt5::Widgets libqmmp ${GME_LIB}) install(TARGETS gme DESTINATION ${PLUGIN_DIR}/Input) ENDIF(GME_FOUND) diff --git a/src/plugins/Input/modplug/CMakeLists.txt b/src/plugins/Input/modplug/CMakeLists.txt index 1dce7bed3..1c927a3b2 100644 --- a/src/plugins/Input/modplug/CMakeLists.txt +++ b/src/plugins/Input/modplug/CMakeLists.txt @@ -57,8 +57,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MODPLUG_FOUND) ADD_LIBRARY(modplug MODULE ${libmodplug_SRCS} ${libmodplug_UIS_H} ${libmodplug_RCC_SRCS} ${libmodplug_HDRS}) -add_dependencies(modplug qmmp) -target_link_libraries(modplug Qt5::Widgets -lqmmp ${MODPLUG_LDFLAGS}) +add_dependencies(modplug libqmmp) +target_link_libraries(modplug Qt5::Widgets libqmmp ${MODPLUG_LDFLAGS}) install(TARGETS modplug DESTINATION ${PLUGIN_DIR}/Input) ENDIF(MODPLUG_FOUND) diff --git a/src/plugins/Input/mpc/CMakeLists.txt b/src/plugins/Input/mpc/CMakeLists.txt index afaee5f0e..c9ab9b744 100644 --- a/src/plugins/Input/mpc/CMakeLists.txt +++ b/src/plugins/Input/mpc/CMakeLists.txt @@ -39,7 +39,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MPC_FOUND) ADD_LIBRARY(mpc MODULE ${libmpc_SRCS} ${libmpc_RCC_SRCS} ${libmpc_HDRS}) -add_dependencies(mpc qmmp) -target_link_libraries(mpc Qt5::Widgets -lqmmp ${MPC_LIB} ${TAGLIB_LDFLAGS}) +add_dependencies(mpc libqmmp) +target_link_libraries(mpc Qt5::Widgets libqmmp ${MPC_LIB} ${TAGLIB_LDFLAGS}) install(TARGETS mpc DESTINATION ${PLUGIN_DIR}/Input) ENDIF(MPC_FOUND) diff --git a/src/plugins/Input/mpeg/CMakeLists.txt b/src/plugins/Input/mpeg/CMakeLists.txt index ffa63504e..f14c70202 100644 --- a/src/plugins/Input/mpeg/CMakeLists.txt +++ b/src/plugins/Input/mpeg/CMakeLists.txt @@ -65,7 +65,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MAD_FOUND OR MPG123_FOUND) ADD_LIBRARY(mpeg MODULE ${libmpeg_SRCS} ${libmpeg_UIS_H} ${libmpeg_RCC_SRCS} ${libmpeg_HDRS}) -add_dependencies(mpeg qmmp) -target_link_libraries(mpeg Qt5::Widgets -lqmmp ${TAGLIB_LDFLAGS} ${MAD_LDFLAGS} ${MPG123_LDFLAGS}) +add_dependencies(mpeg libqmmp) +target_link_libraries(mpeg Qt5::Widgets libqmmp ${TAGLIB_LDFLAGS} ${MAD_LDFLAGS} ${MPG123_LDFLAGS}) install(TARGETS mpeg DESTINATION ${PLUGIN_DIR}/Input) ENDIF(MAD_FOUND OR MPG123_FOUND) diff --git a/src/plugins/Input/opus/CMakeLists.txt b/src/plugins/Input/opus/CMakeLists.txt index cedd7e36e..f5454d1e2 100644 --- a/src/plugins/Input/opus/CMakeLists.txt +++ b/src/plugins/Input/opus/CMakeLists.txt @@ -36,7 +36,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(OPUS_FOUND) ADD_LIBRARY(opus MODULE ${libopus_SRCS} ${libopus_RCC_SRCS} ${libopus_HDRS}) -add_dependencies(opus qmmp) -target_link_libraries(opus Qt5::Widgets -lqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS}) +add_dependencies(opus libqmmp) +target_link_libraries(opus Qt5::Widgets libqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS opus DESTINATION ${PLUGIN_DIR}/Input) ENDIF(OPUS_FOUND) diff --git a/src/plugins/Input/sid/CMakeLists.txt b/src/plugins/Input/sid/CMakeLists.txt index a1ed59cda..54c174104 100644 --- a/src/plugins/Input/sid/CMakeLists.txt +++ b/src/plugins/Input/sid/CMakeLists.txt @@ -45,7 +45,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(SIDPLAYFP_FOUND) ADD_LIBRARY(sid MODULE ${libsid_SRCS} ${libsid_UIS_H} ${libsid_RCC_SRCS} ${libsid_HDRS}) -add_dependencies(sid qmmp) -target_link_libraries(sid Qt5::Widgets -lqmmp ${SIDPLAYFP_LDFLAGS}) +add_dependencies(sid libqmmp) +target_link_libraries(sid Qt5::Widgets libqmmp ${SIDPLAYFP_LDFLAGS}) install(TARGETS sid DESTINATION ${PLUGIN_DIR}/Input) ENDIF(SIDPLAYFP_FOUND) diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt index 68588a617..4bb349f15 100644 --- a/src/plugins/Input/sndfile/CMakeLists.txt +++ b/src/plugins/Input/sndfile/CMakeLists.txt @@ -33,8 +33,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(SNDFILE_FOUND) ADD_LIBRARY(sndfile MODULE ${libsndfile_SRCS} ${libsndfile_UIS_H} ${libsndfile_RCC_SRCS} ${libsndfile_HDRS}) -add_dependencies(sndfile qmmp) -target_link_libraries(sndfile Qt5::Widgets -lqmmp ${SNDFILE_LDFLAGS}) +add_dependencies(sndfile libqmmp) +target_link_libraries(sndfile Qt5::Widgets libqmmp ${SNDFILE_LDFLAGS}) install(TARGETS sndfile DESTINATION ${PLUGIN_DIR}/Input) ENDIF(SNDFILE_FOUND) diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt index dddb901b5..66892c211 100644 --- a/src/plugins/Input/vorbis/CMakeLists.txt +++ b/src/plugins/Input/vorbis/CMakeLists.txt @@ -36,7 +36,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(VORBIS_FOUND) ADD_LIBRARY(vorbis MODULE ${libvorbis_SRCS} ${libvorbis_RCC_SRCS} ${libvorbis_HDRS}) -add_dependencies(vorbis qmmp) -target_link_libraries(vorbis Qt5::Widgets -lqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS}) +add_dependencies(vorbis libqmmp) +target_link_libraries(vorbis Qt5::Widgets libqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS vorbis DESTINATION ${PLUGIN_DIR}/Input) ENDIF(VORBIS_FOUND) diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt index 40922528c..670fe035a 100644 --- a/src/plugins/Input/wavpack/CMakeLists.txt +++ b/src/plugins/Input/wavpack/CMakeLists.txt @@ -33,8 +33,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(WAVPACK_FOUND) ADD_LIBRARY(wavpack MODULE ${libwavpack_SRCS} ${libwavpack_RCC_SRCS} ${libwavpack_HDRS}) -add_dependencies(wavpack qmmp) -target_link_libraries(wavpack Qt5::Widgets -lqmmp ${WAVPACK_LDFLAGS}) +add_dependencies(wavpack libqmmp) +target_link_libraries(wavpack Qt5::Widgets libqmmp ${WAVPACK_LDFLAGS}) install(TARGETS wavpack DESTINATION ${PLUGIN_DIR}/Input) ENDIF(WAVPACK_FOUND) diff --git a/src/plugins/Input/wildmidi/CMakeLists.txt b/src/plugins/Input/wildmidi/CMakeLists.txt index c0ba4abd7..93b4bdb2c 100644 --- a/src/plugins/Input/wildmidi/CMakeLists.txt +++ b/src/plugins/Input/wildmidi/CMakeLists.txt @@ -48,7 +48,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(WILDMIDI_FOUND) ADD_LIBRARY(wildmidi MODULE ${libwildmidi_SRCS} ${libwildmidi_UIS_H} ${libwildmidi_RCC_SRCS} ${libwildmidi_HDRS}) -add_dependencies(wildmidi qmmp) -target_link_libraries(wildmidi Qt5::Widgets -lqmmp ${WILDMIDI_LIB}) +add_dependencies(wildmidi libqmmp) +target_link_libraries(wildmidi Qt5::Widgets libqmmp ${WILDMIDI_LIB}) install(TARGETS wildmidi DESTINATION ${PLUGIN_DIR}/Input) ENDIF(WILDMIDI_FOUND) diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt index 44a9a86b1..754cecd12 100644 --- a/src/plugins/Output/alsa/CMakeLists.txt +++ b/src/plugins/Output/alsa/CMakeLists.txt @@ -35,8 +35,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(ALSA_FOUND) ADD_LIBRARY(alsa MODULE ${libalsa_SRCS} ${libalsa_UIS_H} ${libalsa_RCC_SRCS}) -add_dependencies(alsa qmmp) -target_link_libraries(alsa Qt5::Widgets -lqmmp ${ALSA_LDFLAGS}) +add_dependencies(alsa libqmmp) +target_link_libraries(alsa Qt5::Widgets libqmmp ${ALSA_LDFLAGS}) install(TARGETS alsa DESTINATION ${PLUGIN_DIR}/Output) ENDIF(ALSA_FOUND) diff --git a/src/plugins/Output/directsound/CMakeLists.txt b/src/plugins/Output/directsound/CMakeLists.txt index 52a3128ff..82e1afaed 100644 --- a/src/plugins/Output/directsound/CMakeLists.txt +++ b/src/plugins/Output/directsound/CMakeLists.txt @@ -27,8 +27,8 @@ QT5_ADD_RESOURCES(libdirectsound_RCC_SRCS ${libdirectsound_RCCS}) IF(DSOUND_H_FOUND) ADD_LIBRARY(directsound MODULE ${libdirectsound_SRCS} ${libdirectsound_RCC_SRCS} ${libdirectsound_HDRS}) -add_dependencies(directsound qmmp) -target_link_libraries(directsound Qt5::Widgets -lqmmp -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound) +add_dependencies(directsound libqmmp) +target_link_libraries(directsound Qt5::Widgets libqmmp -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound) install(TARGETS directsound DESTINATION ${PLUGIN_DIR}/Output) ENDIF(DSOUND_H_FOUND) diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt index 3a46e9ae3..0d70c3cd1 100644 --- a/src/plugins/Output/jack/CMakeLists.txt +++ b/src/plugins/Output/jack/CMakeLists.txt @@ -38,12 +38,12 @@ QT5_ADD_RESOURCES(libjack_RCC_SRCS ${libjack_RCCS}) IF(JACK_FOUND) ADD_LIBRARY(jack MODULE ${libjack_SRCS} ${libjack_RCC_SRCS} ${libjack_HDRS}) -add_dependencies(jack qmmp) +add_dependencies(jack libqmmp) set_target_properties(jack PROPERTIES COMPILE_FLAGS -pthread LINK_FLAGS -pthread ) -target_link_libraries(jack Qt5::Widgets -lqmmp ${JACK_LDFLAGS}) +target_link_libraries(jack Qt5::Widgets libqmmp ${JACK_LDFLAGS}) install(TARGETS jack DESTINATION ${PLUGIN_DIR}/Output) ENDIF(JACK_FOUND) diff --git a/src/plugins/Output/null/CMakeLists.txt b/src/plugins/Output/null/CMakeLists.txt index 1b58d9b72..c38fedbac 100644 --- a/src/plugins/Output/null/CMakeLists.txt +++ b/src/plugins/Output/null/CMakeLists.txt @@ -25,6 +25,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(null MODULE ${libnull_SRCS} ${libnull_UIS_H} ${libnull_RCC_SRCS} ${libnull_HDRS}) -add_dependencies(null qmmp) -target_link_libraries(null Qt5::Widgets -lqmmp) +add_dependencies(null libqmmp) +target_link_libraries(null Qt5::Widgets libqmmp) install(TARGETS null DESTINATION ${PLUGIN_DIR}/Output) diff --git a/src/plugins/Output/oss/CMakeLists.txt b/src/plugins/Output/oss/CMakeLists.txt index 4d90b76a8..83d4ae697 100644 --- a/src/plugins/Output/oss/CMakeLists.txt +++ b/src/plugins/Output/oss/CMakeLists.txt @@ -37,6 +37,6 @@ QT5_WRAP_UI(liboss_UIS_H ${liboss_UIS}) ADD_LIBRARY(oss MODULE ${liboss_SRCS} ${liboss_UIS_H} ${liboss_RCC_SRCS} ${liboss_HDRS}) -add_dependencies(oss qmmp) -target_link_libraries(oss Qt5::Widgets -lqmmp) +add_dependencies(oss libqmmp) +target_link_libraries(oss Qt5::Widgets libqmmp) install(TARGETS oss DESTINATION ${PLUGIN_DIR}/Output) diff --git a/src/plugins/Output/oss4/CMakeLists.txt b/src/plugins/Output/oss4/CMakeLists.txt index a46dbb71c..317bfa9f9 100644 --- a/src/plugins/Output/oss4/CMakeLists.txt +++ b/src/plugins/Output/oss4/CMakeLists.txt @@ -71,7 +71,7 @@ IF(OSS4_FOUND) QT5_WRAP_UI(liboss4_UIS_H ${liboss4_UIS}) ADD_LIBRARY(oss4 MODULE ${liboss4_SRCS} ${liboss4_UIS_H} ${liboss4_RCC_SRCS} ${liboss4_HDRS}) -add_dependencies(oss4 qmmp) -target_link_libraries(oss4 Qt5::Widgets -lqmmp) +add_dependencies(oss4 libqmmp) +target_link_libraries(oss4 Qt5::Widgets libqmmp) install(TARGETS oss4 DESTINATION ${PLUGIN_DIR}/Output) ENDIF(OSS4_FOUND) diff --git a/src/plugins/Output/pulseaudio/CMakeLists.txt b/src/plugins/Output/pulseaudio/CMakeLists.txt index 4b1239e4d..ff19515ef 100644 --- a/src/plugins/Output/pulseaudio/CMakeLists.txt +++ b/src/plugins/Output/pulseaudio/CMakeLists.txt @@ -33,8 +33,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(PULSE_FOUND) ADD_LIBRARY(pulseaudio MODULE ${libpulseaudio_SRCS} ${libpulseaudio_UIS_H} ${libpulseaudio_RCC_SRCS} ${libpulseaudio_HDRS}) -add_dependencies(pulseaudio qmmp) -target_link_libraries(pulseaudio Qt5::Widgets -lqmmp ${PULSE_LDFLAGS}) +add_dependencies(pulseaudio libqmmp) +target_link_libraries(pulseaudio Qt5::Widgets libqmmp ${PULSE_LDFLAGS}) install(TARGETS pulseaudio DESTINATION ${PLUGIN_DIR}/Output) ENDIF(PULSE_FOUND) diff --git a/src/plugins/Output/qtmultimedia/CMakeLists.txt b/src/plugins/Output/qtmultimedia/CMakeLists.txt index 607c97d29..4c74e0550 100644 --- a/src/plugins/Output/qtmultimedia/CMakeLists.txt +++ b/src/plugins/Output/qtmultimedia/CMakeLists.txt @@ -26,6 +26,6 @@ QT5_WRAP_UI(libqtmultimedia_UIS_H ${libqtmultimedia_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(qtmultimedia MODULE ${libqtmultimedia_SRCS} ${libqtmultimedia_UIS_H} ${libqtmultimedia_RCC_SRCS}) -add_dependencies(qtmultimedia qmmp) -target_link_libraries(qtmultimedia Qt5::Widgets Qt5::Multimedia -lqmmp) +add_dependencies(qtmultimedia libqmmp) +target_link_libraries(qtmultimedia Qt5::Widgets Qt5::Multimedia libqmmp) install(TARGETS qtmultimedia DESTINATION ${PLUGIN_DIR}/Output) diff --git a/src/plugins/Output/shout/CMakeLists.txt b/src/plugins/Output/shout/CMakeLists.txt index 7c12646ac..36d6bc669 100644 --- a/src/plugins/Output/shout/CMakeLists.txt +++ b/src/plugins/Output/shout/CMakeLists.txt @@ -35,7 +35,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(SHOUT_FOUND) ADD_LIBRARY(shout MODULE ${libshout_SRCS} ${libshout_UIS_H} ${libshout_RCC_SRCS}) -add_dependencies(shout qmmp) -target_link_libraries(shout Qt5::Widgets -lqmmp ${SHOUT_LDFLAGS}) +add_dependencies(shout libqmmp) +target_link_libraries(shout Qt5::Widgets libqmmp ${SHOUT_LDFLAGS}) install(TARGETS shout DESTINATION ${PLUGIN_DIR}/Output) ENDIF(SHOUT_FOUND) diff --git a/src/plugins/Output/wasapi/CMakeLists.txt b/src/plugins/Output/wasapi/CMakeLists.txt index 3af4105f4..5d36be321 100644 --- a/src/plugins/Output/wasapi/CMakeLists.txt +++ b/src/plugins/Output/wasapi/CMakeLists.txt @@ -39,7 +39,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(WASAPI_FOUND) ADD_LIBRARY(wasapi MODULE ${libwasapi_SRCS} ${libwasapi_RCC_SRCS} ${libwasapi_HDRS} ${libwasapi_UIS_H}) -add_dependencies(wasapi qmmp) +add_dependencies(wasapi libqmmp) target_link_libraries(wasapi Qt5::Widgets libqmmp -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -lksuser) install(TARGETS wasapi DESTINATION ${PLUGIN_DIR}/Output) ENDIF(WASAPI_FOUND) diff --git a/src/plugins/Output/waveout/CMakeLists.txt b/src/plugins/Output/waveout/CMakeLists.txt index 083683088..d28037300 100644 --- a/src/plugins/Output/waveout/CMakeLists.txt +++ b/src/plugins/Output/waveout/CMakeLists.txt @@ -27,8 +27,8 @@ QT5_ADD_RESOURCES(libwaveout_RCC_SRCS ${libwaveout_RCCS}) IF(WINDOWS_H_FOUND) ADD_LIBRARY(waveout MODULE ${libwaveout_SRCS} ${libwaveout_RCC_SRCS} ${libwaveout_HDRS}) -add_dependencies(waveout qmmp) -target_link_libraries(waveout Qt5::Widgets -lqmmp -lwinmm) +add_dependencies(waveout libqmmp) +target_link_libraries(waveout Qt5::Widgets libqmmp -lwinmm) install(TARGETS waveout DESTINATION ${PLUGIN_DIR}/Output) ENDIF(WINDOWS_H_FOUND) diff --git a/src/plugins/PlayListFormats/m3u/CMakeLists.txt b/src/plugins/PlayListFormats/m3u/CMakeLists.txt index 7d3a02c91..6c5fd6a77 100644 --- a/src/plugins/PlayListFormats/m3u/CMakeLists.txt +++ b/src/plugins/PlayListFormats/m3u/CMakeLists.txt @@ -17,6 +17,7 @@ QT5_ADD_RESOURCES(libm3uplaylistformat_RCC_SRCS ${libm3uplaylistformat_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(m3uplaylistformat MODULE ${libm3uplaylistformat_SRCS}) -add_dependencies(m3uplaylistformat qmmpui) -target_link_libraries(m3uplaylistformat Qt5::Widgets -lqmmpui) + +add_dependencies(m3uplaylistformat libqmmpui) +target_link_libraries(m3uplaylistformat Qt5::Widgets libqmmpui) install(TARGETS m3uplaylistformat DESTINATION ${PLUGIN_DIR}/PlayListFormats) diff --git a/src/plugins/PlayListFormats/pls/CMakeLists.txt b/src/plugins/PlayListFormats/pls/CMakeLists.txt index f9b0d536e..22ceb2546 100644 --- a/src/plugins/PlayListFormats/pls/CMakeLists.txt +++ b/src/plugins/PlayListFormats/pls/CMakeLists.txt @@ -17,6 +17,6 @@ QT5_ADD_RESOURCES(libplsplaylistformat_RCC_SRCS ${libplsplaylistformat_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(plsplaylistformat MODULE ${libplsplaylistformat_SRCS}) -add_dependencies(plsplaylistformat qmmpui) -target_link_libraries(plsplaylistformat Qt5::Widgets -lqmmpui) +add_dependencies(plsplaylistformat libqmmpui) +target_link_libraries(plsplaylistformat Qt5::Widgets libqmmpui) install(TARGETS plsplaylistformat DESTINATION ${PLUGIN_DIR}/PlayListFormats) diff --git a/src/plugins/PlayListFormats/xspf/CMakeLists.txt b/src/plugins/PlayListFormats/xspf/CMakeLists.txt index 06be8df4d..13acb00eb 100644 --- a/src/plugins/PlayListFormats/xspf/CMakeLists.txt +++ b/src/plugins/PlayListFormats/xspf/CMakeLists.txt @@ -18,6 +18,6 @@ QT5_ADD_RESOURCES(libxspfplaylistformat_RCC_SRCS ${libxspfplaylistformat_RCCS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(xspfplaylistformat MODULE ${libxspfplaylistformat_SRCS}) -add_dependencies(xspfplaylistformat qmmpui) -target_link_libraries(xspfplaylistformat Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(xspfplaylistformat libqmmpui) +target_link_libraries(xspfplaylistformat Qt5::Widgets libqmmpui libqmmp) install(TARGETS xspfplaylistformat DESTINATION ${PLUGIN_DIR}/PlayListFormats) diff --git a/src/plugins/Transports/http/CMakeLists.txt b/src/plugins/Transports/http/CMakeLists.txt index 1033d91c1..17aeda68e 100644 --- a/src/plugins/Transports/http/CMakeLists.txt +++ b/src/plugins/Transports/http/CMakeLists.txt @@ -45,11 +45,11 @@ IF(CURL_FOUND) ADD_LIBRARY(http MODULE ${libhttp_SRCS} ${libhttp_UIS_H} ${libhttp_RCC_SRCS}) IF(USE_ENCA AND ENCA_FOUND) -target_link_libraries(http Qt5::Widgets -lqmmp ${CURL_LDFLAGS} ${CURL_CFLAGS} ${ENCA_LDFLAGS} ${ENCA_CFLAGS}) +target_link_libraries(http Qt5::Widgets libqmmp ${CURL_LDFLAGS} ${CURL_CFLAGS} ${ENCA_LDFLAGS} ${ENCA_CFLAGS}) ELSE(USE_ENCA AND ENCA_FOUND) -target_link_libraries(http Qt5::Widgets -lqmmp ${CURL_LDFLAGS}) +target_link_libraries(http Qt5::Widgets libqmmp ${CURL_LDFLAGS}) ENDIF(USE_ENCA AND ENCA_FOUND) -add_dependencies(http qmmp) +add_dependencies(http libqmmp) install(TARGETS http DESTINATION ${PLUGIN_DIR}/Transports) ENDIF(CURL_FOUND) diff --git a/src/plugins/Transports/mms/CMakeLists.txt b/src/plugins/Transports/mms/CMakeLists.txt index 568479ca1..97d899f5f 100644 --- a/src/plugins/Transports/mms/CMakeLists.txt +++ b/src/plugins/Transports/mms/CMakeLists.txt @@ -36,7 +36,7 @@ QT5_WRAP_UI(libmms_UIS_H ${libmms_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MMS_FOUND) ADD_LIBRARY(mms MODULE ${libmms_SRCS} ${libmms_UIS_H} ${libmms_RCC_SRCS}) -target_link_libraries(mms Qt5::Widgets -lqmmp ${MMS_LDFLAGS}) -add_dependencies(mms qmmp) +target_link_libraries(mms Qt5::Widgets libqmmp ${MMS_LDFLAGS}) +add_dependencies(mms libqmmp) install(TARGETS mms DESTINATION ${PLUGIN_DIR}/Transports) ENDIF(MMS_FOUND) diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt index 36862fa67..7af2f503d 100644 --- a/src/plugins/Ui/qsui/CMakeLists.txt +++ b/src/plugins/Ui/qsui/CMakeLists.txt @@ -70,6 +70,6 @@ QT5_WRAP_UI(libqsui_UIS_H ${libqsui_UIS}) include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(qsui MODULE ${libqsui_SRCS} ${libqsui_UIS_H} ${libqsui_RCC_SRCS} ${libqsui_HDRS}) -add_dependencies(qsui qmmpui libqmmp) -target_link_libraries(qsui Qt5::Widgets -lqmmpui -lqmmp) +add_dependencies(qsui libqmmpui libqmmp) +target_link_libraries(qsui Qt5::Widgets libqmmpui libqmmp) install(TARGETS qsui DESTINATION ${PLUGIN_DIR}/Ui) diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt index ef85a487c..49982da4d 100644 --- a/src/plugins/Ui/skinned/CMakeLists.txt +++ b/src/plugins/Ui/skinned/CMakeLists.txt @@ -97,7 +97,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(X11_FOUND) ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS}) -add_dependencies(skinned qmmpui libqmmp) -target_link_libraries(skinned Qt5::Widgets Qt5::X11Extras -lqmmpui -lqmmp ${X11_LDFLAGS}) +add_dependencies(skinned libqmmpui libqmmp) +target_link_libraries(skinned Qt5::Widgets Qt5::X11Extras libqmmpui libqmmp ${X11_LDFLAGS}) install(TARGETS skinned DESTINATION ${PLUGIN_DIR}/Ui) ENDIF(X11_FOUND) diff --git a/src/plugins/Visual/analyzer/CMakeLists.txt b/src/plugins/Visual/analyzer/CMakeLists.txt index 8cd50aac8..83e95f5ff 100644 --- a/src/plugins/Visual/analyzer/CMakeLists.txt +++ b/src/plugins/Visual/analyzer/CMakeLists.txt @@ -37,6 +37,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(analyzer MODULE ${libanalyzer_SRCS} ${libanalyzer_UIS_H} ${libanalyzer_RCC_SRCS} ${libanalyzer_HDRS}) -add_dependencies(analyzer qmmp) -target_link_libraries(analyzer Qt5::Widgets -lqmmp) +add_dependencies(analyzer libqmmp) +target_link_libraries(analyzer Qt5::Widgets libqmmp) install(TARGETS analyzer DESTINATION ${PLUGIN_DIR}/Visual) diff --git a/src/plugins/Visual/projectm/CMakeLists.txt b/src/plugins/Visual/projectm/CMakeLists.txt index 7cc6a328d..6e724723b 100644 --- a/src/plugins/Visual/projectm/CMakeLists.txt +++ b/src/plugins/Visual/projectm/CMakeLists.txt @@ -40,7 +40,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(PROJECTM_FOUND) ADD_LIBRARY(projectm MODULE ${libprojectm_SRCS} ${libprojectm_RCC_SRCS}) target_compile_definitions(projectm PRIVATE ${libprojectm_DEFINES}) -add_dependencies(projectm qmmp) -target_link_libraries(projectm Qt5::Widgets -lqmmp ${PROJECTM_LDFLAGS} -lGL) +add_dependencies(projectm libqmmp) +target_link_libraries(projectm Qt5::Widgets libqmmp ${PROJECTM_LDFLAGS} -lGL) install(TARGETS projectm DESTINATION ${PLUGIN_DIR}/Visual) ENDIF(PROJECTM_FOUND) diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index d4099197d..a08fde35f 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -11,8 +11,8 @@ win32 { unix { PLUGINS_PREFIX=../../../../lib/qmmp-$${QMMP_VERSION_MAJOR}.$${QMMP_VERSION_MINOR} - LIBS += -lqmmp - QMMPUI_LIB = -lqmmpui + LIBS += -lqmmp$$APP_NAME_SUFFIX + QMMPUI_LIB = -lqmmpui$$APP_NAME_SUFFIX } diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index 012eb3a42..fd0a33dac 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -132,13 +132,20 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(libqmmp SHARED ${libqmmp_SRCS} ${libqmmp_HDRS}) target_link_libraries(libqmmp Qt5::Widgets) -SET_TARGET_PROPERTIES(libqmmp PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION} OUTPUT_NAME qmmp) +SET_TARGET_PROPERTIES(libqmmp PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION} OUTPUT_NAME qmmp${APP_NAME_SUFFIX}) target_compile_definitions(libqmmp PRIVATE ${libqmmp_DEFINES}) install(TARGETS libqmmp LIBRARY DESTINATION ${LIB_DIR} RUNTIME DESTINATION bin ARCHIVE DESTINATION ${LIB_DIR}) install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION include/qmmp) +IF(APP_NAME_SUFFIX) + install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION include/qmmp${APP_NAME_SUFFIX}/qmmp) + SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/qmmp${APP_NAME_SUFFIX}) +ELSE() + install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION include/qmmp) + SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include) +ENDIF() -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmp.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmp.pc DESTINATION ${LIB_DIR}/pkgconfig) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmp.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmp${APP_NAME_SUFFIX}.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmp${APP_NAME_SUFFIX}.pc DESTINATION ${LIB_DIR}/pkgconfig) diff --git a/src/qmmp/qmmp.pc.in b/src/qmmp/qmmp.pc.in index abd42a91e..be11ca7e3 100644 --- a/src/qmmp/qmmp.pc.in +++ b/src/qmmp/qmmp.pc.in @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ libdir=@CMAKE_INSTALL_PREFIX@/@LIB_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +includedir=@QMMP_INCLUDE_DIR@ -Name: qmmp +Name: qmmp@APP_NAME_SUFFIX@ Description: qmmp core library Version: @QMMP_VERSION@ Requires: Qt5Core Qt5Gui Qt5Widgets -Libs: -L${libdir} -lqmmp +Libs: -L${libdir} -lqmmp@APP_NAME_SUFFIX@ Cflags: -I${includedir} diff --git a/src/qmmp/qmmp.pro b/src/qmmp/qmmp.pro index c57ad462a..b6aa4bbcf 100644 --- a/src/qmmp/qmmp.pro +++ b/src/qmmp/qmmp.pro @@ -77,7 +77,7 @@ SOURCES += recycler.cpp \ visualbuffer.cpp \ trackinfo.cpp -unix:TARGET = ../../lib/qmmp +unix:TARGET = ../../lib/qmmp$$APP_NAME_SUFFIX win32:TARGET = ../../../bin/qmmp CONFIG += shared \ warn_on \ @@ -138,7 +138,11 @@ unix { volume.h \ qmmp_export.h - devel.path = $$PREFIX/include/qmmp + isEmpty(APP_NAME_SUFFIX) { + devel.path = $$PREFIX/include/qmmp + } else { + devel.path = $$PREFIX/include/qmmp$${APP_NAME_SUFFIX}/qmmp + } INSTALLS += target \ devel DESTDIR = . @@ -148,11 +152,15 @@ INCLUDEPATH += ./ unix { CONFIG += create_pc create_prl no_install_prl - QMAKE_PKGCONFIG_NAME = qmmp + QMAKE_PKGCONFIG_NAME = qmmp$${APP_NAME_SUFFIX} QMAKE_PKGCONFIG_DESCRIPTION = qmmp core library QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5Gui Qt5Widgets QMAKE_PKGCONFIG_DESTDIR = pkgconfig QMAKE_PKGCONFIG_PREFIX = $$PREFIX QMAKE_PKGCONFIG_LIBDIR = $$target.path - QMAKE_PKGCONFIG_INCDIR = $$PREFIX/include + isEmpty(APP_NAME_SUFFIX) { + QMAKE_PKGCONFIG_INCDIR = $$PREFIX/include + } else { + QMAKE_PKGCONFIG_INCDIR = $$PREFIX/include/qmmp$${APP_NAME_SUFFIX} + } } diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt index 7bef4a500..501f6deb8 100644 --- a/src/qmmpui/CMakeLists.txt +++ b/src/qmmpui/CMakeLists.txt @@ -130,15 +130,23 @@ QT5_ADD_RESOURCES(libqmmpui_RCC_SRCS translations/libqmmpui_locales.qrc txt/txt. include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_LIBRARY(qmmpui SHARED ${libqmmpui_SRCS} ${libqmmpui_RCC_SRCS} ${libqmmpui_UIS_H} ${libqmmpui_HDRS}) -target_link_libraries(qmmpui Qt5::Widgets Qt5::Network -lqmmp) -add_dependencies(qmmpui libqmmp) -SET_TARGET_PROPERTIES(qmmpui PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION}) -SET_TARGET_PROPERTIES(qmmpui PROPERTIES COMPILE_DEFINITIONS "${libqmmpui_DEFINES}") -install(TARGETS qmmpui LIBRARY DESTINATION ${LIB_DIR} - RUNTIME DESTINATION bin - ARCHIVE DESTINATION ${LIB_DIR}) -install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmpui) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmpui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmpui.pc DESTINATION ${LIB_DIR}/pkgconfig) + +ADD_LIBRARY(libqmmpui SHARED ${libqmmpui_SRCS} ${libqmmpui_RCC_SRCS} ${libqmmpui_UIS_H} ${libqmmpui_HDRS}) +target_link_libraries(libqmmpui Qt5::Widgets Qt5::Network libqmmp) +add_dependencies(libqmmpui libqmmp) +SET_TARGET_PROPERTIES(libqmmpui PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION} OUTPUT_NAME qmmpui${APP_NAME_SUFFIX}) +SET_TARGET_PROPERTIES(libqmmpui PROPERTIES COMPILE_DEFINITIONS "${libqmmpui_DEFINES}") +install(TARGETS libqmmpui LIBRARY DESTINATION ${LIB_DIR} + RUNTIME DESTINATION bin + ARCHIVE DESTINATION ${LIB_DIR}) + + +IF(APP_NAME_SUFFIX) + install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmp${APP_NAME_SUFFIX}/qmmpui) + SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include/qmmp${APP_NAME_SUFFIX}) +ELSE() + install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmpui) + SET(QMMP_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include) +ENDIF() +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmmpui.pc.in ${CMAKE_CURRENT_BINARY_DIR}/qmmpui${APP_NAME_SUFFIX}.pc @ONLY) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qmmpui${APP_NAME_SUFFIX}.pc DESTINATION ${LIB_DIR}/pkgconfig) diff --git a/src/qmmpui/qmmpui.pc.in b/src/qmmpui/qmmpui.pc.in index 19a82a4d5..af1902f71 100644 --- a/src/qmmpui/qmmpui.pc.in +++ b/src/qmmpui/qmmpui.pc.in @@ -1,11 +1,11 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ libdir=@CMAKE_INSTALL_PREFIX@/@LIB_DIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +includedir=@QMMP_INCLUDE_DIR@ -Name: qmmpui +Name: qmmpui@APP_NAME_SUFFIX@ Description: qmmp user interface library Version: @QMMP_VERSION@ -Requires: Qt5Core Qt5Gui Qt5Widgets Qt5Network qmmp -Libs: -L${libdir} -lqmmpui +Requires: Qt5Core Qt5Gui Qt5Widgets Qt5Network qmmp@APP_NAME_SUFFIX@ +Libs: -L${libdir} -lqmmpui@APP_NAME_SUFFIX@ Cflags: -I${includedir} diff --git a/src/qmmpui/qmmpui.pro b/src/qmmpui/qmmpui.pro index 380939087..467ea8ddf 100644 --- a/src/qmmpui/qmmpui.pro +++ b/src/qmmpui/qmmpui.pro @@ -15,8 +15,8 @@ QMAKE_LIBDIR += ../../lib \ qmmpui unix { - TARGET = ../../lib/qmmpui - LIBS += -L../../lib -lqmmp + TARGET = ../../lib/qmmpui$$APP_NAME_SUFFIX + LIBS += -L../../lib -lqmmp$$APP_NAME_SUFFIX target.path = $$LIB_DIR } @@ -172,18 +172,26 @@ unix { metadataformattermenu.h \ qmmpui_export.h - devel.path = $$PREFIX/include/qmmpui + isEmpty(APP_NAME_SUFFIX) { + devel.path = $$PREFIX/include/qmmpui + } else { + devel.path = $$PREFIX/include/qmmp$${APP_NAME_SUFFIX}/qmmpui + } INSTALLS += target \ devel } unix { CONFIG += create_pc create_prl no_install_prl - QMAKE_PKGCONFIG_NAME = qmmpui + QMAKE_PKGCONFIG_NAME = qmmpui$${APP_NAME_SUFFIX} QMAKE_PKGCONFIG_DESCRIPTION = qmmp user interface library - QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5Gui Qt5Widgets Qt5Network qmmp + QMAKE_PKGCONFIG_REQUIRES = Qt5Core Qt5Gui Qt5Widgets Qt5Network qmmp$${APP_NAME_SUFFIX} QMAKE_PKGCONFIG_DESTDIR = pkgconfig QMAKE_PKGCONFIG_PREFIX = $$PREFIX QMAKE_PKGCONFIG_LIBDIR = $$target.path - QMAKE_PKGCONFIG_INCDIR = $$PREFIX/include + isEmpty(APP_NAME_SUFFIX) { + QMAKE_PKGCONFIG_INCDIR = $$PREFIX/include + } else { + QMAKE_PKGCONFIG_INCDIR = $$PREFIX/include/qmmp$${APP_NAME_SUFFIX} + } } |