18 files changed, 22 insertions, 20 deletions
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)