diff options
71 files changed, 128 insertions, 92 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 556f7d823..d4b5e7fcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,7 +75,12 @@ set(LIB_SUFFIX 64) ENDIF("${QT_LIBRARY_DIR}" MATCHES lib64) ENDIF(NOT LIB_SUFFIX) -SET(LIB_DIR "lib${LIB_SUFFIX}" CACHE STRING "library path") +IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin) + SET(LIB_DIR "qmmp.app/Contents/Frameworks" CACHE STRING "library path") +ELSE() + SET(LIB_DIR "lib${LIB_SUFFIX}" CACHE STRING "library path") +ENDIF() + 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") @@ -85,6 +90,10 @@ add_subdirectory(src/qmmp) add_subdirectory(src/qmmpui) add_subdirectory(src/plugins) add_subdirectory(src/app) +IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + #Hack for MacOS X to run fix_mac_libs.sh script after installation + add_subdirectory(src/mac) +ENDIF() MACRO(PRINT_SUMMARY str USE FOUND) IF(${USE} AND ${FOUND}) diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index f95d97041..0d6a27f80 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -46,17 +46,23 @@ QT4_ADD_RESOURCES(app_RCC_SRCS ${app_RCCS}) # the UI file won't be wrapped! include_directories(${CMAKE_CURRENT_BINARY_DIR}) -ADD_EXECUTABLE(qmmp ${app_SRCS} ${app_RCC_SRCS} ${app_HDRS}) +ADD_EXECUTABLE(qmmp MACOSX_BUNDLE ${app_SRCS} ${app_RCC_SRCS} ${app_HDRS}) target_link_libraries(qmmp ${QT_LIBRARIES} libqmmp qmmpui) add_dependencies(qmmp qmmpui 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) - -IF(USE_DIR_ASSOC) -install(FILES qmmp_enqueue.desktop DESTINATION share/applications) -install(FILES qmmp_dir.desktop DESTINATION share/applications) -ENDIF(USE_DIR_ASSOC) +IF(${CMAKE_SYSTEM_NAME} MATCHES Darwin) + set(MACOSX_BUNDLE_GUI_IDENTIFIER "com.ylsoftware.qmmp") + set(MACOSX_BUNDLE_ICON_FILE "icons.icns") + install(TARGETS qmmp DESTINATION .) + install(FILES images/mac/icons.icns DESTINATION ./qmmp.app/Contents/Resources) +ELSE() + 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) + IF(USE_DIR_ASSOC) + install(FILES qmmp_enqueue.desktop DESTINATION share/applications) + install(FILES qmmp_dir.desktop DESTINATION share/applications) + ENDIF(USE_DIR_ASSOC) +ENDIF() diff --git a/src/app/images/mac/icons.icns b/src/app/images/mac/icons.icns Binary files differnew file mode 100644 index 000000000..7d1da8cd8 --- /dev/null +++ b/src/app/images/mac/icons.icns diff --git a/src/mac/CMakeLists.txt b/src/mac/CMakeLists.txt new file mode 100644 index 000000000..9a90971bb --- /dev/null +++ b/src/mac/CMakeLists.txt @@ -0,0 +1,3 @@ +#Hack for MacOS X to run fix_mac_libs.sh script after installation +cmake_minimum_required(VERSION 2.8.6) +install(CODE "execute_process(COMMAND ${CMAKE_SOURCE_DIR}/utils/fix_mac_libs.sh ${CMAKE_INSTALL_PREFIX}/qmmp.app)") diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt index 002a27bf8..335f1f1aa 100644 --- a/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/CMakeLists.txt @@ -43,5 +43,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(incdecvolumeoption MODULE ${libincdecvolumeoption_SRCS} ${libincdecvolumeoption_RCC_SRCS}) add_dependencies(incdecvolumeoption qmmpui) -target_link_libraries(incdecvolumeoption ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(incdecvolumeoption ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS incdecvolumeoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt index fb0f6fbad..57b77e77e 100644 --- a/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/PlayListOption/CMakeLists.txt @@ -43,5 +43,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(playlistoption MODULE ${libplaylistoption_SRCS} ${libplaylistoption_RCC_SRCS}) add_dependencies(playlistoption qmmpui) -target_link_libraries(playlistoption ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(playlistoption ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS playlistoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt index b028002a7..3bb1d5c54 100644 --- a/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/SeekOption/CMakeLists.txt @@ -42,5 +42,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(seekoption MODULE ${seekoption_SRCS} ${seekoption_RCC_SRCS}) add_dependencies(seekoption qmmpui) -target_link_libraries(seekoption ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(seekoption ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS seekoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt index e1a576e5b..510cb9025 100644 --- a/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt +++ b/src/plugins/CommandLineOptions/StatusOption/CMakeLists.txt @@ -42,5 +42,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(statusoption MODULE ${statusoption_SRCS} ${statusoption_RCC_SRCS}) add_dependencies(statusoption qmmpui) -target_link_libraries(statusoption ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(statusoption ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS statusoption DESTINATION ${LIB_DIR}/qmmp/CommandLineOptions) diff --git a/src/plugins/Effect/bs2b/CMakeLists.txt b/src/plugins/Effect/bs2b/CMakeLists.txt index d9a808c53..4f47d5b06 100644 --- a/src/plugins/Effect/bs2b/CMakeLists.txt +++ b/src/plugins/Effect/bs2b/CMakeLists.txt @@ -60,6 +60,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${BS2B_LDFLAGS}) +target_link_libraries(bs2b ${QT_LIBRARIES} libqmmp ${BS2B_LDFLAGS}) install(TARGETS bs2b DESTINATION ${LIB_DIR}/qmmp/Effect) ENDIF(BS2B_FOUND) diff --git a/src/plugins/Effect/crossfade/CMakeLists.txt b/src/plugins/Effect/crossfade/CMakeLists.txt index d388e797d..3eac518f6 100644 --- a/src/plugins/Effect/crossfade/CMakeLists.txt +++ b/src/plugins/Effect/crossfade/CMakeLists.txt @@ -54,5 +54,5 @@ 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 ${QT_LIBRARIES} -lqmmp) +target_link_libraries(crossfade ${QT_LIBRARIES} libqmmp) install(TARGETS crossfade DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Effect/ladspa/CMakeLists.txt b/src/plugins/Effect/ladspa/CMakeLists.txt index e6123d95f..b8cdbc01d 100644 --- a/src/plugins/Effect/ladspa/CMakeLists.txt +++ b/src/plugins/Effect/ladspa/CMakeLists.txt @@ -56,6 +56,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${CMAKE_DL_LIBS}) +target_link_libraries(ladspa ${QT_LIBRARIES} libqmmp ${CMAKE_DL_LIBS}) install(TARGETS ladspa DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Effect/srconverter/CMakeLists.txt b/src/plugins/Effect/srconverter/CMakeLists.txt index c46286bd9..19341e529 100644 --- a/src/plugins/Effect/srconverter/CMakeLists.txt +++ b/src/plugins/Effect/srconverter/CMakeLists.txt @@ -61,6 +61,6 @@ IF(SAMPLERATE_FOUND) ADD_LIBRARY(srconverter MODULE ${libsrconverter_SRCS} ${libsrconverter_UIS_H} ${libsrconverter_RCC_SRCS} ${libsrconverter_HDRS}) add_dependencies(srconverter qmmp) -target_link_libraries(srconverter ${QT_LIBRARIES} -lqmmp ${SAMPLERATE_LDFLAGS}) +target_link_libraries(srconverter ${QT_LIBRARIES} libqmmp ${SAMPLERATE_LDFLAGS}) install(TARGETS srconverter DESTINATION ${LIB_DIR}/qmmp/Effect) ENDIF(SAMPLERATE_FOUND) diff --git a/src/plugins/Effect/stereo/CMakeLists.txt b/src/plugins/Effect/stereo/CMakeLists.txt index eb5aafe36..ec775d587 100644 --- a/src/plugins/Effect/stereo/CMakeLists.txt +++ b/src/plugins/Effect/stereo/CMakeLists.txt @@ -53,5 +53,5 @@ 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 ${QT_LIBRARIES} -lqmmp) +target_link_libraries(stereo ${QT_LIBRARIES} libqmmp) install(TARGETS stereo DESTINATION ${LIB_DIR}/qmmp/Effect) diff --git a/src/plugins/Engines/mplayer/CMakeLists.txt b/src/plugins/Engines/mplayer/CMakeLists.txt index 66f17afde..0964ffccc 100644 --- a/src/plugins/Engines/mplayer/CMakeLists.txt +++ b/src/plugins/Engines/mplayer/CMakeLists.txt @@ -52,6 +52,6 @@ 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 ${QT_LIBRARIES} -lqmmp) +target_link_libraries(mplayer ${QT_LIBRARIES} libqmmp) install(TARGETS mplayer DESTINATION ${LIB_DIR}/qmmp/Engines) diff --git a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt index c591c0c19..3edbcbcb5 100644 --- a/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt +++ b/src/plugins/FileDialogs/QmmpFileDialog/CMakeLists.txt @@ -51,5 +51,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(qmmpfiledialog ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS qmmpfiledialog DESTINATION ${LIB_DIR}/qmmp/FileDialogs) diff --git a/src/plugins/General/converter/CMakeLists.txt b/src/plugins/General/converter/CMakeLists.txt index 85081775e..27b272887 100644 --- a/src/plugins/General/converter/CMakeLists.txt +++ b/src/plugins/General/converter/CMakeLists.txt @@ -62,5 +62,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp ${TAGLIB_LDFLAGS}) +target_link_libraries(converter ${QT_LIBRARIES} qmmpui libqmmp ${TAGLIB_LDFLAGS}) install(TARGETS converter DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/copypaste/CMakeLists.txt b/src/plugins/General/copypaste/CMakeLists.txt index c64d9d3c1..449dd47fe 100644 --- a/src/plugins/General/copypaste/CMakeLists.txt +++ b/src/plugins/General/copypaste/CMakeLists.txt @@ -45,5 +45,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(copypaste ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS copypaste DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/covermanager/CMakeLists.txt b/src/plugins/General/covermanager/CMakeLists.txt index 8fc9522cf..cfccff6f0 100644 --- a/src/plugins/General/covermanager/CMakeLists.txt +++ b/src/plugins/General/covermanager/CMakeLists.txt @@ -56,5 +56,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(covermanager ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS covermanager DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/fileops/CMakeLists.txt b/src/plugins/General/fileops/CMakeLists.txt index 268af2fed..0272e92df 100644 --- a/src/plugins/General/fileops/CMakeLists.txt +++ b/src/plugins/General/fileops/CMakeLists.txt @@ -55,5 +55,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(fileops ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS fileops DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/gnomehotkey/CMakeLists.txt b/src/plugins/General/gnomehotkey/CMakeLists.txt index f36beb0be..e43f1e59c 100644 --- a/src/plugins/General/gnomehotkey/CMakeLists.txt +++ b/src/plugins/General/gnomehotkey/CMakeLists.txt @@ -42,5 +42,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(gnomehotkey MODULE ${libgnomehotkey_SRCS} ${libgnomehotkey_RCC_SRCS}) add_dependencies(gnomehotkey qmmpui) -target_link_libraries(gnomehotkey ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(gnomehotkey ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS gnomehotkey DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/hal/CMakeLists.txt b/src/plugins/General/hal/CMakeLists.txt index b436fcfce..0ddca6001 100644 --- a/src/plugins/General/hal/CMakeLists.txt +++ b/src/plugins/General/hal/CMakeLists.txt @@ -52,5 +52,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(hal ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS hal DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/hotkey/CMakeLists.txt b/src/plugins/General/hotkey/CMakeLists.txt index 1e489598e..9cf92014c 100644 --- a/src/plugins/General/hotkey/CMakeLists.txt +++ b/src/plugins/General/hotkey/CMakeLists.txt @@ -69,6 +69,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(X11_FOUND) ADD_LIBRARY(hotkey MODULE ${libhotkey_SRCS} ${libhotkey_UIS_H} ${libhotkey_RCC_SRCS}) add_dependencies(hotkey qmmpui) -target_link_libraries(hotkey ${QT_LIBRARIES} -lqmmpui -lqmmp ${X11_LDFLAGS}) +target_link_libraries(hotkey ${QT_LIBRARIES} qmmpui libqmmp ${X11_LDFLAGS}) install(TARGETS hotkey DESTINATION ${LIB_DIR}/qmmp/General) ENDIF(X11_FOUND) diff --git a/src/plugins/General/kdenotify/CMakeLists.txt b/src/plugins/General/kdenotify/CMakeLists.txt index 5fac1e62e..6ae054805 100644 --- a/src/plugins/General/kdenotify/CMakeLists.txt +++ b/src/plugins/General/kdenotify/CMakeLists.txt @@ -53,7 +53,9 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(kdenotify ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS kdenotify DESTINATION ${LIB_DIR}/qmmp/General) -install(FILES images/empty_cover.png DESTINATION share/qmmp/images) -install(FILES images/app_icon.png DESTINATION share/qmmp/images) +IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + install(FILES images/empty_cover.png DESTINATION share/qmmp/images) + install(FILES images/app_icon.png DESTINATION share/qmmp/images) +ENDIF() diff --git a/src/plugins/General/lyrics/CMakeLists.txt b/src/plugins/General/lyrics/CMakeLists.txt index 82a45f332..850ac86fc 100644 --- a/src/plugins/General/lyrics/CMakeLists.txt +++ b/src/plugins/General/lyrics/CMakeLists.txt @@ -56,5 +56,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(lyrics ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS lyrics DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/mpris/CMakeLists.txt b/src/plugins/General/mpris/CMakeLists.txt index ec0bad8de..fe89bbc45 100644 --- a/src/plugins/General/mpris/CMakeLists.txt +++ b/src/plugins/General/mpris/CMakeLists.txt @@ -53,5 +53,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(mpris MODULE ${libmpris_SRCS} ${libmpris_RCC_SRCS}) add_dependencies(mpris qmmpui) -target_link_libraries(mpris ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(mpris ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS mpris DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/notifier/CMakeLists.txt b/src/plugins/General/notifier/CMakeLists.txt index 3ee3300bb..8b12331c8 100644 --- a/src/plugins/General/notifier/CMakeLists.txt +++ b/src/plugins/General/notifier/CMakeLists.txt @@ -54,5 +54,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(notifier MODULE ${libnotifier_SRCS} ${libnotifier_UIS_H} ${libnotifier_RCC_SRCS}) add_dependencies(notifier qmmpui) -target_link_libraries(notifier ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(notifier ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS notifier DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/rgscan/CMakeLists.txt b/src/plugins/General/rgscan/CMakeLists.txt index 89eb3054d..f9efd1500 100644 --- a/src/plugins/General/rgscan/CMakeLists.txt +++ b/src/plugins/General/rgscan/CMakeLists.txt @@ -66,5 +66,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp ${TAGLIB_LDFLAGS}) +target_link_libraries(rgscan ${QT_LIBRARIES} qmmpui libqmmp ${TAGLIB_LDFLAGS}) install(TARGETS rgscan DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/scrobbler/CMakeLists.txt b/src/plugins/General/scrobbler/CMakeLists.txt index 67213747e..3815be3b6 100644 --- a/src/plugins/General/scrobbler/CMakeLists.txt +++ b/src/plugins/General/scrobbler/CMakeLists.txt @@ -60,5 +60,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(scrobbler ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS scrobbler DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/statusicon/CMakeLists.txt b/src/plugins/General/statusicon/CMakeLists.txt index b9cb7ff5c..d809fb404 100644 --- a/src/plugins/General/statusicon/CMakeLists.txt +++ b/src/plugins/General/statusicon/CMakeLists.txt @@ -56,5 +56,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(statusicon ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS statusicon DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/streambrowser/CMakeLists.txt b/src/plugins/General/streambrowser/CMakeLists.txt index 7cea884be..0589c5c7c 100644 --- a/src/plugins/General/streambrowser/CMakeLists.txt +++ b/src/plugins/General/streambrowser/CMakeLists.txt @@ -56,5 +56,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(streambrowser ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS streambrowser DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/trackchange/CMakeLists.txt b/src/plugins/General/trackchange/CMakeLists.txt index 555ac570a..1bf2048d8 100644 --- a/src/plugins/General/trackchange/CMakeLists.txt +++ b/src/plugins/General/trackchange/CMakeLists.txt @@ -52,5 +52,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(trackchange ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS trackchange DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/udisks/CMakeLists.txt b/src/plugins/General/udisks/CMakeLists.txt index d62c54704..ced2af46e 100644 --- a/src/plugins/General/udisks/CMakeLists.txt +++ b/src/plugins/General/udisks/CMakeLists.txt @@ -52,5 +52,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(udisks MODULE ${libudisks_SRCS} ${libudisks_UIS_H} ${libudisks_RCC_SRCS}) add_dependencies(udisks qmmpui) -target_link_libraries(udisks ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(udisks ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS udisks DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/General/udisks2/CMakeLists.txt b/src/plugins/General/udisks2/CMakeLists.txt index b178936d1..2e37c22a6 100644 --- a/src/plugins/General/udisks2/CMakeLists.txt +++ b/src/plugins/General/udisks2/CMakeLists.txt @@ -52,5 +52,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(udisks2 ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS udisks2 DESTINATION ${LIB_DIR}/qmmp/General) diff --git a/src/plugins/Input/aac/CMakeLists.txt b/src/plugins/Input/aac/CMakeLists.txt index 7238af106..6227e0007 100644 --- a/src/plugins/Input/aac/CMakeLists.txt +++ b/src/plugins/Input/aac/CMakeLists.txt @@ -85,6 +85,6 @@ 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 ${QT_LIBRARIES} -lqmmp -lfaad ${TAGLIB_LDFLAGS}) +target_link_libraries(aac ${QT_LIBRARIES} libqmmp -lfaad ${TAGLIB_LDFLAGS}) install(TARGETS aac DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FAAD_FOUND) diff --git a/src/plugins/Input/cdaudio/CMakeLists.txt b/src/plugins/Input/cdaudio/CMakeLists.txt index dccfc530b..0ce98e435 100644 --- a/src/plugins/Input/cdaudio/CMakeLists.txt +++ b/src/plugins/Input/cdaudio/CMakeLists.txt @@ -57,6 +57,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${CDIO_LDFLAGS}) +target_link_libraries(cdaudio ${QT_LIBRARIES} libqmmp ${CDIO_LDFLAGS}) install(TARGETS cdaudio DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(CDIO_FOUND) diff --git a/src/plugins/Input/cue/CMakeLists.txt b/src/plugins/Input/cue/CMakeLists.txt index d7f81c9d2..09bd3472d 100644 --- a/src/plugins/Input/cue/CMakeLists.txt +++ b/src/plugins/Input/cue/CMakeLists.txt @@ -65,8 +65,8 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(cue MODULE ${libcue_SRCS} ${libcue_RCC_SRCS} ${libcue_UIS_H} ${libcue_HDRS}) add_dependencies(cue qmmp) IF(USE_ENCA AND ENCA_FOUND) -target_link_libraries(cue ${QT_LIBRARIES} -lqmmp ${ENCA_LDFLAGS}) +target_link_libraries(cue ${QT_LIBRARIES} libqmmp ${ENCA_LDFLAGS}) ELSE(USE_ENCA AND ENCA_FOUND) -target_link_libraries(cue ${QT_LIBRARIES} -lqmmp) +target_link_libraries(cue ${QT_LIBRARIES} libqmmp) ENDIF(USE_ENCA AND ENCA_FOUND) install(TARGETS cue DESTINATION ${LIB_DIR}/qmmp/Input) diff --git a/src/plugins/Input/ffmpeg/CMakeLists.txt b/src/plugins/Input/ffmpeg/CMakeLists.txt index 615096abf..ce2c84c04 100644 --- a/src/plugins/Input/ffmpeg/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg/CMakeLists.txt @@ -67,6 +67,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${FFMPEG_LDFLAGS}) +target_link_libraries(ffmpeg ${QT_LIBRARIES} libqmmp ${FFMPEG_LDFLAGS}) install(TARGETS ffmpeg DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FFMPEG_FOUND) diff --git a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt index a6e295a41..576951671 100644 --- a/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt +++ b/src/plugins/Input/ffmpeg_legacy/CMakeLists.txt @@ -73,6 +73,6 @@ IF(FFMPEG_LEGACY_FOUND) ADD_LIBRARY(ffmpeg_legacy MODULE ${libffmpeg_SRCS} ${libffmpeg_UIS_H} ${libffmpeg_RCC_SRCS} ${libffmpeg_HDRS}) add_dependencies(ffmpeg_legacy qmmp) -target_link_libraries(ffmpeg_legacy ${QT_LIBRARIES} -lqmmp ${FFMPEG_LEGACY_LDFLAGS}) +target_link_libraries(ffmpeg_legacy ${QT_LIBRARIES} libqmmp ${FFMPEG_LEGACY_LDFLAGS}) install(TARGETS ffmpeg_legacy DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FFMPEG_LEGACY_FOUND) diff --git a/src/plugins/Input/flac/CMakeLists.txt b/src/plugins/Input/flac/CMakeLists.txt index 5611d5325..6673df895 100644 --- a/src/plugins/Input/flac/CMakeLists.txt +++ b/src/plugins/Input/flac/CMakeLists.txt @@ -63,6 +63,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${FLAC_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(flac ${QT_LIBRARIES} libqmmp ${FLAC_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS flac DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(FLAC_FOUND) diff --git a/src/plugins/Input/gme/CMakeLists.txt b/src/plugins/Input/gme/CMakeLists.txt index b4aca13cf..b5d65312e 100644 --- a/src/plugins/Input/gme/CMakeLists.txt +++ b/src/plugins/Input/gme/CMakeLists.txt @@ -60,6 +60,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(GME_FOUND) ADD_LIBRARY(gme MODULE ${libgme_SRCS} ${libgme_RCC_SRCS} ${libgme_HDRS}) add_dependencies(gme qmmp) -target_link_libraries(gme ${QT_LIBRARIES} -lqmmp ${GME_LIB}) +target_link_libraries(gme ${QT_LIBRARIES} libqmmp ${GME_LIB}) install(TARGETS gme DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(GME_FOUND) diff --git a/src/plugins/Input/mad/CMakeLists.txt b/src/plugins/Input/mad/CMakeLists.txt index e44c74d75..16b944c93 100644 --- a/src/plugins/Input/mad/CMakeLists.txt +++ b/src/plugins/Input/mad/CMakeLists.txt @@ -67,6 +67,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(MAD_FOUND) ADD_LIBRARY(mad MODULE ${libmad_SRCS} ${libmad_UIS_H} ${libmad_RCC_SRCS} ${libmad_HDRS}) add_dependencies(mad qmmp) -target_link_libraries(mad ${QT_LIBRARIES} -lqmmp ${MAD_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(mad ${QT_LIBRARIES} libqmmp ${MAD_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS mad DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(MAD_FOUND) diff --git a/src/plugins/Input/modplug/CMakeLists.txt b/src/plugins/Input/modplug/CMakeLists.txt index bc38fee1e..4edb9aa84 100644 --- a/src/plugins/Input/modplug/CMakeLists.txt +++ b/src/plugins/Input/modplug/CMakeLists.txt @@ -77,7 +77,7 @@ 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 ${QT_LIBRARIES} -lqmmp ${MODPLUG_LDFLAGS}) +target_link_libraries(modplug ${QT_LIBRARIES} libqmmp ${MODPLUG_LDFLAGS}) install(TARGETS modplug DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(MODPLUG_FOUND) diff --git a/src/plugins/Input/mpc/CMakeLists.txt b/src/plugins/Input/mpc/CMakeLists.txt index 71b13b439..e8135012e 100644 --- a/src/plugins/Input/mpc/CMakeLists.txt +++ b/src/plugins/Input/mpc/CMakeLists.txt @@ -66,6 +66,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${MPC_LIB} ${TAGLIB_LDFLAGS}) +target_link_libraries(mpc ${QT_LIBRARIES} libqmmp ${MPC_LIB} ${TAGLIB_LDFLAGS}) install(TARGETS mpc DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(MPC_FOUND) diff --git a/src/plugins/Input/opus/CMakeLists.txt b/src/plugins/Input/opus/CMakeLists.txt index ac4b72d6a..100dbd692 100644 --- a/src/plugins/Input/opus/CMakeLists.txt +++ b/src/plugins/Input/opus/CMakeLists.txt @@ -64,6 +64,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(opus ${QT_LIBRARIES} libqmmp ${OPUS_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS opus DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(OPUS_FOUND) diff --git a/src/plugins/Input/sid/CMakeLists.txt b/src/plugins/Input/sid/CMakeLists.txt index db662630f..de49fd63a 100644 --- a/src/plugins/Input/sid/CMakeLists.txt +++ b/src/plugins/Input/sid/CMakeLists.txt @@ -65,6 +65,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${SIDPLAYFP_LDFLAGS}) +target_link_libraries(sid ${QT_LIBRARIES} libqmmp ${SIDPLAYFP_LDFLAGS}) install(TARGETS sid DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(SIDPLAYFP_FOUND) diff --git a/src/plugins/Input/sndfile/CMakeLists.txt b/src/plugins/Input/sndfile/CMakeLists.txt index 30467ce26..1be328d21 100644 --- a/src/plugins/Input/sndfile/CMakeLists.txt +++ b/src/plugins/Input/sndfile/CMakeLists.txt @@ -53,7 +53,7 @@ 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 ${QT_LIBRARIES} -lqmmp ${SNDFILE_LDFLAGS}) +target_link_libraries(sndfile ${QT_LIBRARIES} libqmmp ${SNDFILE_LDFLAGS}) install(TARGETS sndfile DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(SNDFILE_FOUND) diff --git a/src/plugins/Input/vorbis/CMakeLists.txt b/src/plugins/Input/vorbis/CMakeLists.txt index 009decbee..447d0bd98 100644 --- a/src/plugins/Input/vorbis/CMakeLists.txt +++ b/src/plugins/Input/vorbis/CMakeLists.txt @@ -58,6 +58,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS}) +target_link_libraries(vorbis ${QT_LIBRARIES} libqmmp ${VORBIS_LDFLAGS} ${TAGLIB_LDFLAGS}) install(TARGETS vorbis DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(VORBIS_FOUND) diff --git a/src/plugins/Input/wavpack/CMakeLists.txt b/src/plugins/Input/wavpack/CMakeLists.txt index 55c1dc464..83380f3b1 100644 --- a/src/plugins/Input/wavpack/CMakeLists.txt +++ b/src/plugins/Input/wavpack/CMakeLists.txt @@ -55,7 +55,7 @@ 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 ${QT_LIBRARIES} -lqmmp ${WAVPACK_LDFLAGS}) +target_link_libraries(wavpack ${QT_LIBRARIES} libqmmp ${WAVPACK_LDFLAGS}) install(TARGETS wavpack DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(WAVPACK_FOUND) diff --git a/src/plugins/Input/wildmidi/CMakeLists.txt b/src/plugins/Input/wildmidi/CMakeLists.txt index f24e9862f..868b11002 100644 --- a/src/plugins/Input/wildmidi/CMakeLists.txt +++ b/src/plugins/Input/wildmidi/CMakeLists.txt @@ -71,6 +71,6 @@ 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 ${QT_LIBRARIES} -lqmmp ${WILDMIDI_LIB}) +target_link_libraries(wildmidi ${QT_LIBRARIES} libqmmp ${WILDMIDI_LIB}) install(TARGETS wildmidi DESTINATION ${LIB_DIR}/qmmp/Input) ENDIF(WILDMIDI_FOUND) diff --git a/src/plugins/Output/alsa/CMakeLists.txt b/src/plugins/Output/alsa/CMakeLists.txt index 7b4e361fb..873a65a84 100644 --- a/src/plugins/Output/alsa/CMakeLists.txt +++ b/src/plugins/Output/alsa/CMakeLists.txt @@ -55,7 +55,7 @@ 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 ${QT_LIBRARIES} -lqmmp ${ALSA_LDFLAGS}) +target_link_libraries(alsa ${QT_LIBRARIES} libqmmp ${ALSA_LDFLAGS}) install(TARGETS alsa DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(ALSA_FOUND) diff --git a/src/plugins/Output/directsound/CMakeLists.txt b/src/plugins/Output/directsound/CMakeLists.txt index c2b085c90..33ccf853d 100644 --- a/src/plugins/Output/directsound/CMakeLists.txt +++ b/src/plugins/Output/directsound/CMakeLists.txt @@ -47,7 +47,7 @@ QT4_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 ${QT_LIBRARIES} -lqmmp -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound) +target_link_libraries(directsound ${QT_LIBRARIES} libqmmp -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32 -ldsound) install(TARGETS directsound DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(DSOUND_H_FOUND) diff --git a/src/plugins/Output/jack/CMakeLists.txt b/src/plugins/Output/jack/CMakeLists.txt index 260c93d07..29e28eae7 100644 --- a/src/plugins/Output/jack/CMakeLists.txt +++ b/src/plugins/Output/jack/CMakeLists.txt @@ -78,7 +78,7 @@ set_target_properties(jack PROPERTIES COMPILE_FLAGS -pthread LINK_FLAGS -pthread ) -target_link_libraries(jack ${QT_LIBRARIES} -lqmmp ${JACK_LDFLAGS}) +target_link_libraries(jack ${QT_LIBRARIES} libqmmp ${JACK_LDFLAGS}) install(TARGETS jack DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(JACK_FOUND) diff --git a/src/plugins/Output/null/CMakeLists.txt b/src/plugins/Output/null/CMakeLists.txt index 8057dfbe3..0349db637 100644 --- a/src/plugins/Output/null/CMakeLists.txt +++ b/src/plugins/Output/null/CMakeLists.txt @@ -45,5 +45,5 @@ 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 ${QT_LIBRARIES} -lqmmp) +target_link_libraries(null ${QT_LIBRARIES} libqmmp) install(TARGETS null DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/plugins/Output/oss/CMakeLists.txt b/src/plugins/Output/oss/CMakeLists.txt index 94c18454f..c4ddefe6f 100644 --- a/src/plugins/Output/oss/CMakeLists.txt +++ b/src/plugins/Output/oss/CMakeLists.txt @@ -56,6 +56,6 @@ QT4_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 ${QT_LIBRARIES} -lqmmp) +target_link_libraries(oss ${QT_LIBRARIES} libqmmp) install(TARGETS oss DESTINATION ${LIB_DIR}/qmmp/Output) diff --git a/src/plugins/Output/oss4/CMakeLists.txt b/src/plugins/Output/oss4/CMakeLists.txt index bf3fd6f6a..6d7b2f36b 100644 --- a/src/plugins/Output/oss4/CMakeLists.txt +++ b/src/plugins/Output/oss4/CMakeLists.txt @@ -90,6 +90,6 @@ QT4_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 ${QT_LIBRARIES} -lqmmp) +target_link_libraries(oss4 ${QT_LIBRARIES} libqmmp) install(TARGETS oss4 DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(OSS4_FOUND) diff --git a/src/plugins/Output/pulseaudio/CMakeLists.txt b/src/plugins/Output/pulseaudio/CMakeLists.txt index db5825c08..9211a8998 100644 --- a/src/plugins/Output/pulseaudio/CMakeLists.txt +++ b/src/plugins/Output/pulseaudio/CMakeLists.txt @@ -53,7 +53,7 @@ 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 ${QT_LIBRARIES} -lqmmp ${PULSE_LDFLAGS}) +target_link_libraries(pulseaudio ${QT_LIBRARIES} libqmmp ${PULSE_LDFLAGS}) install(TARGETS pulseaudio DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(PULSE_FOUND) diff --git a/src/plugins/Output/qtmultimedia/CMakeLists.txt b/src/plugins/Output/qtmultimedia/CMakeLists.txt index d5352b3c1..eca39c72b 100644 --- a/src/plugins/Output/qtmultimedia/CMakeLists.txt +++ b/src/plugins/Output/qtmultimedia/CMakeLists.txt @@ -55,6 +55,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(${QT_QTMULTIMEDIA_FOUND}) ADD_LIBRARY(qtmultimedia MODULE ${libqtmultimedia_SRCS} ${libqtmultimedia_UIS_H} ${libqtmultimedia_RCC_SRCS} ${libqtmultimedia_HDRS}) add_dependencies(qtmultimedia qmmp) - target_link_libraries(qtmultimedia ${QT_LIBRARIES} -lqmmp) + target_link_libraries(qtmultimedia ${QT_LIBRARIES} libqmmp) install(TARGETS qtmultimedia DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(${QT_QTMULTIMEDIA_FOUND}) diff --git a/src/plugins/Output/waveout/CMakeLists.txt b/src/plugins/Output/waveout/CMakeLists.txt index 377004296..0791fa68e 100644 --- a/src/plugins/Output/waveout/CMakeLists.txt +++ b/src/plugins/Output/waveout/CMakeLists.txt @@ -47,7 +47,7 @@ QT4_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 ${QT_LIBRARIES} -lqmmp -lwinmm) +target_link_libraries(waveout ${QT_LIBRARIES} libqmmp -lwinmm) install(TARGETS waveout DESTINATION ${LIB_DIR}/qmmp/Output) ENDIF(WINDOWS_H_FOUND) diff --git a/src/plugins/PlayListFormats/m3u/CMakeLists.txt b/src/plugins/PlayListFormats/m3u/CMakeLists.txt index f40c5d5b1..62aa50d45 100644 --- a/src/plugins/PlayListFormats/m3u/CMakeLists.txt +++ b/src/plugins/PlayListFormats/m3u/CMakeLists.txt @@ -38,5 +38,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(m3uplaylistformat MODULE ${libm3uplaylistformat_SRCS}) add_dependencies(m3uplaylistformat qmmpui) -target_link_libraries(m3uplaylistformat ${QT_LIBRARIES} -lqmmpui) +target_link_libraries(m3uplaylistformat ${QT_LIBRARIES} qmmpui) install(TARGETS m3uplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats) diff --git a/src/plugins/PlayListFormats/pls/CMakeLists.txt b/src/plugins/PlayListFormats/pls/CMakeLists.txt index f22d1d33e..03e7ba520 100644 --- a/src/plugins/PlayListFormats/pls/CMakeLists.txt +++ b/src/plugins/PlayListFormats/pls/CMakeLists.txt @@ -38,5 +38,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(plsplaylistformat MODULE ${libplsplaylistformat_SRCS}) add_dependencies(plsplaylistformat qmmpui) -target_link_libraries(plsplaylistformat ${QT_LIBRARIES} -lqmmpui) +target_link_libraries(plsplaylistformat ${QT_LIBRARIES} qmmpui) install(TARGETS plsplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats) diff --git a/src/plugins/PlayListFormats/xspf/CMakeLists.txt b/src/plugins/PlayListFormats/xspf/CMakeLists.txt index 60635e7d8..5e87071a5 100644 --- a/src/plugins/PlayListFormats/xspf/CMakeLists.txt +++ b/src/plugins/PlayListFormats/xspf/CMakeLists.txt @@ -38,5 +38,5 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) ADD_LIBRARY(xspfplaylistformat MODULE ${libxspfplaylistformat_SRCS}) add_dependencies(xspfplaylistformat qmmpui) -target_link_libraries(xspfplaylistformat ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(xspfplaylistformat ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS xspfplaylistformat DESTINATION ${LIB_DIR}/qmmp/PlayListFormats) diff --git a/src/plugins/Transports/http/CMakeLists.txt b/src/plugins/Transports/http/CMakeLists.txt index 793dde428..f046f823e 100644 --- a/src/plugins/Transports/http/CMakeLists.txt +++ b/src/plugins/Transports/http/CMakeLists.txt @@ -65,9 +65,9 @@ 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 ${QT_LIBRARIES} -lqmmp ${CURL_LDFLAGS} ${CURL_CFLAGS} ${ENCA_LDFLAGS} ${ENCA_CFLAGS}) +target_link_libraries(http ${QT_LIBRARIES} libqmmp ${CURL_LDFLAGS} ${CURL_CFLAGS} ${ENCA_LDFLAGS} ${ENCA_CFLAGS}) ELSE(USE_ENCA AND ENCA_FOUND) -target_link_libraries(http ${QT_LIBRARIES} -lqmmp ${CURL_LDFLAGS}) +target_link_libraries(http ${QT_LIBRARIES} libqmmp ${CURL_LDFLAGS}) ENDIF(USE_ENCA AND ENCA_FOUND) add_dependencies(http qmmp) diff --git a/src/plugins/Transports/mms/CMakeLists.txt b/src/plugins/Transports/mms/CMakeLists.txt index b5c365548..a6c79867c 100644 --- a/src/plugins/Transports/mms/CMakeLists.txt +++ b/src/plugins/Transports/mms/CMakeLists.txt @@ -56,7 +56,7 @@ QT4_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 ${QT_LIBRARIES} -lqmmp ${MMS_LDFLAGS}) +target_link_libraries(mms ${QT_LIBRARIES} libqmmp ${MMS_LDFLAGS}) add_dependencies(mms qmmp) install(TARGETS mms DESTINATION ${LIB_DIR}/qmmp/Transports) ENDIF(MMS_FOUND) diff --git a/src/plugins/Ui/qsui/CMakeLists.txt b/src/plugins/Ui/qsui/CMakeLists.txt index fe6510015..0e2080acf 100644 --- a/src/plugins/Ui/qsui/CMakeLists.txt +++ b/src/plugins/Ui/qsui/CMakeLists.txt @@ -86,5 +86,5 @@ 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 ${QT_LIBRARIES} -lqmmpui -lqmmp) +target_link_libraries(qsui ${QT_LIBRARIES} qmmpui libqmmp) install(TARGETS qsui DESTINATION ${LIB_DIR}/qmmp/Ui) diff --git a/src/plugins/Ui/skinned/CMakeLists.txt b/src/plugins/Ui/skinned/CMakeLists.txt index f967e4fe8..2eeb31cf1 100644 --- a/src/plugins/Ui/skinned/CMakeLists.txt +++ b/src/plugins/Ui/skinned/CMakeLists.txt @@ -122,6 +122,5 @@ IF(X11_FOUND) ADD_LIBRARY(skinned MODULE ${skinned_SRCS} ${skinned_UIS_H} ${skinned_RCC_SRCS} ${skinned_HDRS}) target_link_libraries(skinned ${QT_LIBRARIES} libqmmp qmmpui ${X11_LDFLAGS}) add_dependencies(skinned qmmpui libqmmp) -target_link_libraries(skinned ${QT_LIBRARIES} -lqmmpui -lqmmp ${X11_LDFLAGS}) install(TARGETS skinned DESTINATION ${LIB_DIR}/qmmp/Ui) ENDIF(X11_FOUND) diff --git a/src/plugins/Visual/analyzer/CMakeLists.txt b/src/plugins/Visual/analyzer/CMakeLists.txt index c9de44a21..9f97929e7 100644 --- a/src/plugins/Visual/analyzer/CMakeLists.txt +++ b/src/plugins/Visual/analyzer/CMakeLists.txt @@ -57,5 +57,5 @@ 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 ${QT_LIBRARIES} -lqmmp) +target_link_libraries(analyzer ${QT_LIBRARIES} libqmmp) install(TARGETS analyzer DESTINATION ${LIB_DIR}/qmmp/Visual) diff --git a/src/plugins/Visual/projectm/CMakeLists.txt b/src/plugins/Visual/projectm/CMakeLists.txt index 4afdfd25e..d4effe4b2 100644 --- a/src/plugins/Visual/projectm/CMakeLists.txt +++ b/src/plugins/Visual/projectm/CMakeLists.txt @@ -64,6 +64,6 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}) IF(PROJECTM_FOUND) ADD_LIBRARY(projectm MODULE ${libprojectm_SRCS} ${libprojectm_RCC_SRCS}) add_dependencies(projectm qmmp) -target_link_libraries(projectm ${QT_LIBRARIES} -lqmmp ${PROJECTM_LDFLAGS} -lGL) +target_link_libraries(projectm ${QT_LIBRARIES} libqmmp ${PROJECTM_LDFLAGS} -lGL) install(TARGETS projectm DESTINATION ${LIB_DIR}/qmmp/Visual) ENDIF(PROJECTM_FOUND) diff --git a/src/qmmp/CMakeLists.txt b/src/qmmp/CMakeLists.txt index 0d6b18a2c..3cc2a0e9b 100644 --- a/src/qmmp/CMakeLists.txt +++ b/src/qmmp/CMakeLists.txt @@ -130,8 +130,9 @@ SET_TARGET_PROPERTIES(libqmmp PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMM install(TARGETS libqmmp LIBRARY DESTINATION ${LIB_DIR} RUNTIME DESTINATION bin ARCHIVE DESTINATION ${LIB_DIR}) -install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION include/qmmp) - -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) +IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES Darwin) + install(FILES ${libqmmp_DEVEL_HDRS} DESTINATION include/qmmp) + 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) +ENDIF() diff --git a/src/qmmp/qmmp.cpp b/src/qmmp/qmmp.cpp index af43163d5..a59491042 100644 --- a/src/qmmp/qmmp.cpp +++ b/src/qmmp/qmmp.cpp @@ -73,16 +73,16 @@ const QString Qmmp::pluginsPath() QByteArray path = qgetenv("QMMP_PLUGINS"); if (!path.isEmpty()) return path; -#ifdef QMMP_INSTALL_PREFIX +#ifdef Q_OS_MAC + QDir dir(qApp->applicationDirPath() + "/../Frameworks/qmmp"); +#elif defined (QMMP_INSTALL_PREFIX) QDir dir(QMMP_INSTALL_PREFIX"/"LIB_DIR"/qmmp"); //qDebug(QMMP_INSTALL_PREFIX"/"LIB_DIR"/qmmp"); -#else -#if defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) +#elif defined(Q_OS_WIN) && !defined(Q_OS_CYGWIN) QDir dir(qApp->applicationDirPath() + "/plugins"); #else QDir dir(qApp->applicationDirPath() + "/../"LIB_DIR"/qmmp"); #endif -#endif return dir.canonicalPath(); } diff --git a/src/qmmpui/CMakeLists.txt b/src/qmmpui/CMakeLists.txt index a54a0142d..72a0d79cb 100644 --- a/src/qmmpui/CMakeLists.txt +++ b/src/qmmpui/CMakeLists.txt @@ -134,13 +134,15 @@ QT4_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 ${QT_LIBRARIES} -lqmmp) +target_link_libraries(qmmpui ${QT_LIBRARIES} libqmmp) add_dependencies(qmmpui libqmmp) SET_TARGET_PROPERTIES(qmmpui PROPERTIES VERSION ${QMMP_VERSION} SOVERSION ${QMMP_SOVERSION}) install(TARGETS qmmpui LIBRARY DESTINATION ${LIB_DIR} RUNTIME DESTINATION bin ARCHIVE DESTINATION ${LIB_DIR}) -install(FILES ${libqmmpui_DEVEL_HDRS} DESTINATION include/qmmpui) +IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES Darwin) + 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) + 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) +ENDIF() diff --git a/utils/fix_mac_libs.sh b/utils/fix_mac_libs.sh new file mode 100755 index 000000000..d2d8c858b --- /dev/null +++ b/utils/fix_mac_libs.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +#This script changes paths in installed binaries to relative. The first argument is path to .app package. + +echo Fixing paths to libraries inside $1... + +FINDDIR=$1/Contents +IFS=$'\n' +for i in `find $FINDDIR -type f -name \*.dylib -or -type f -name \*.so -or -type f -name qmmp` ; do + install_name_tool -change libqmmp.0.dylib @executable_path/../Frameworks/libqmmp.0.dylib $i + install_name_tool -change libqmmpui.0.dylib @executable_path/../Frameworks/libqmmpui.0.dylib $i +done + +echo Fixing paths to libraries done. |