feature to change application name

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@8077 90c681e8-e032-0410-971d-27865f9a5e38

19 files changed, 44 insertions, 39 deletions

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)