iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mac package fixes

Browse Source
This commit is contained in:
craig.p.drummond
2014-07-07 19:03:31 +00:00
committed by craig.p.drummond
parent e28396c06b
commit 5bc8357bbf
12 changed files with 136 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
CMakeLists.txt
View File

@@ -58,6 +58,20 @@ else (WIN32 OR APPLE)
option(USE_SYSTEM_MENU_ICON "Use system menu icon" ON)
endif (WIN32 OR APPLE)
if (WIN32)
set(CANTATA_ICON_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/icons/oxygen)
elseif (APPLE)
set(MACOSX_BUNDLE_BUNDLE_NAME Cantata)
set(MACOSX_BUNDLE_SHORT_VERSION_STRING ${CANATA_VERSION})
set(MACOSX_BUNDLE_VERSION ${CANATA_VERSION})
set(MACOSX_BUNDLE_LONG_VERSION_STRING ${CANTATA_VERSION_FULL})
set(MACOSX_BUNDLE_ICON_FILE "cantata.icns")
set(MACOSX_BUNDLE_RESOURCES "${CMAKE_INSTALL_PREFIX}/cantata.app/Contents/Resources")
set(CANTATA_ICON_INSTALL_PREFIX ${MACOSX_BUNDLE_RESOURCES}/icons/oxygen)
else (WIN32)
set(CANTATA_ICON_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor)
endif (WIN32)
if (ENABLE_UBUNTU)
set(ENABLE_QT5 ON)
set(ENABLE_DYNAMIC OFF)
@@ -628,13 +642,6 @@ else (ENABLE_KDE)
install(TARGETS cantata DESTINATION ${CMAKE_INSTALL_PREFIX})
elseif (APPLE)
ADD_EXECUTABLE(cantata MACOSX_BUNDLE ${CANTATA_SRCS} ${CANTATA_MOC_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
#ADD_EXECUTABLE(cantata ${CANTATA_SRCS} ${CANTATA_MOC_SRCS} ${CANTATA_RC_SRCS} ${CANTATA_UI_HDRS} ${CANTATA_PO})
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
set(MACOSX_BUNDLE_BUNDLE_NAME Cantata)
SET(MACOSX_BUNDLE_SHORT_VERSION_STRING ${CANATA_VERSION})
SET(MACOSX_BUNDLE_VERSION ${CANATA_VERSION})
SET(MACOSX_BUNDLE_LONG_VERSION_STRING ${CANTATA_VERSION_FULL})
set(MACOSX_BUNDLE_ICON_FILE "cantata.icns")
add_subdirectory(mac)
include(DeployQt4)
INSTALL_QT4_EXECUTABLE("cantata.app" "qjpeg;qsvg;qsvgicon")
@@ -660,18 +667,17 @@ endif (X11_FOUND)
if (WIN32)
install(FILES context/ultimate_providers.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/lyrics/)
install(FILES context/weblinks.xml online/podcast_directories.xml scrobbling/scrobblers.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/config/)
install(FILES tags/fixes.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/config/ RENAME tag-fixes.xml)
install(FILES tags/fixes.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/config/ RENAME tag-fixes.xml)
elseif (APPLE)
install(FILES context/ultimate_providers.xml DESTINATION ${MACOSX_BUNDLE_RESOURCES}/lyrics/)
install(FILES context/weblinks.xml online/podcast_directories.xml scrobbling/scrobblers.xml DESTINATION ${MACOSX_BUNDLE_RESOURCES}/config/)
install(FILES tags/fixes.xml DESTINATION ${MACOSX_BUNDLE_RESOURCES}/config/ RENAME tag-fixes.xml)
elseif (NOT ENABLE_UBUNTU)
install(FILES context/ultimate_providers.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/lyrics)
install(FILES context/weblinks.xml online/podcast_directories.xml scrobbling/scrobblers.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/config/)
install(FILES tags/fixes.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/config/ RENAME tag-fixes.xml)
endif (WIN32)
if (ENABLE_HTTP_STREAM_PLAYBACK AND NOT ENABLE_QT5)
target_link_libraries(cantata ${PHONON_LIBS})
include_directories(${PHONON_INCLUDES})
endif (ENABLE_HTTP_STREAM_PLAYBACK AND NOT ENABLE_QT5)
if (ENABLE_HTTP_STREAM_PLAYBACK)
if (ENABLE_LIBVLC)
target_link_libraries(cantata ${LIBVLC_LIBRARY})
@@ -687,37 +693,40 @@ if (ENABLE_HTTP_STREAM_PLAYBACK)
endif (ENABLE_LIBVLC)
endif (ENABLE_HTTP_STREAM_PLAYBACK)
if (WIN32 OR APPLE)
# install(FILES mpd/mpd.conf.template DESTINATION ${CMAKE_INSTALL_PREFIX}/mpd)
else (WIN32 OR APPLE)
if (ENABLE_DYNAMIC)
if (ENABLE_DYNAMIC)
if (WIN32)
# Not installed for windows - script uses sym-links...
elseif (APPLE)
install(PROGRAMS dynamic/cantata-dynamic DESTINATION ${MACOSX_BUNDLE_RESOURCES}/scripts/)
else (WIN32)
install(PROGRAMS dynamic/cantata-dynamic DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/scripts)
endif (ENABLE_DYNAMIC)
if (NOT ENABLE_UBUNTU)
install(FILES mpd/mpd.conf.template DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/mpd)
endif (NOT ENABLE_UBUNTU)
endif (WIN32)
endif (ENABLE_DYNAMIC)
if (MTP_FOUND)
target_link_libraries(cantata ${MTP_LIBRARIES})
include_directories(${MTP_INCLUDE_DIR})
endif (MTP_FOUND)
if (NOT ENABLE_UBUNTU AND NOT WIN32 AND NOT APPLE)
install(FILES mpd/mpd.conf.template DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/mpd)
endif (NOT ENABLE_UBUNTU AND NOT WIN32 AND NOT APPLE)
if (CDDB_FOUND OR MUSICBRAINZ5_FOUND)
target_link_libraries(cantata ${CDPARANOIA_LIBRARIES})
include_directories(${CDPARANOIA_INCLUDE_DIR})
if (CDDB_FOUND)
target_link_libraries(cantata ${CDDB_LIBS})
include_directories(${CDDB_INCLUDE_DIR})
endif (CDDB_FOUND)
if (MUSICBRAINZ5_FOUND)
target_link_libraries(cantata ${MUSICBRAINZ5_LIBRARIES})
include_directories(${MUSICBRAINZ5_INCLUDE_DIRS})
endif (MUSICBRAINZ5_FOUND)
if (ENABLE_KDE)
install(FILES cantata-play-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
endif (ENABLE_KDE)
endif (CDDB_FOUND OR MUSICBRAINZ5_FOUND)
endif (WIN32 OR APPLE)
if (MTP_FOUND)
target_link_libraries(cantata ${MTP_LIBRARIES})
include_directories(${MTP_INCLUDE_DIR})
endif (MTP_FOUND)
if (CDPARANOIA_FOUND AND (CDDB_FOUND OR MUSICBRAINZ5_FOUND))
target_link_libraries(cantata ${CDPARANOIA_LIBRARIES})
include_directories(${CDPARANOIA_INCLUDE_DIR})
if (CDDB_FOUND)
target_link_libraries(cantata ${CDDB_LIBS})
include_directories(${CDDB_INCLUDE_DIR})
endif (CDDB_FOUND)
if (MUSICBRAINZ5_FOUND)
target_link_libraries(cantata ${MUSICBRAINZ5_LIBRARIES})
include_directories(${MUSICBRAINZ5_INCLUDE_DIRS})
endif (MUSICBRAINZ5_FOUND)
if (ENABLE_KDE)
install(FILES cantata-play-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions)
endif (ENABLE_KDE)
endif (CDPARANOIA_FOUND AND (CDDB_FOUND OR MUSICBRAINZ5_FOUND))
if (QJSON_FOUND)
message("-- Using system libqjson")

9
gui/application_mac.cpp
View File

@@ -22,12 +22,21 @@
*/
#include "application_mac.h"
#include "support/utils.h"
#include <QIcon>
Application::Application(int &argc, char **argv)
: SingleApplication(argc, argv)
{
QCoreApplication::setAttribute(Qt::AA_DontShowIconsInMenus, true);
// Setup icon path...
QStringList paths=QIcon::themeSearchPaths();
QString path=Utils::systemDir("icons");
if (!paths.contains(path)) {
QIcon::setThemeSearchPaths(QStringList() << path << paths);
}
QIcon::setThemeName(QLatin1String("oxygen"));
}

92
icons/CMakeLists.txt
View File

@@ -1,58 +1,48 @@
#if (ENABLE_KDE_SUPPORT)
# kde4_install_icons( ${DATA_INSTALL_DIR}/cantata/icons)
#else (ENABLE_KDE_SUPPORT)
if (WIN32 OR APPLE)
install(FILES cantata.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/scalable/apps)
install(FILES cantata16.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/16x16/apps RENAME cantata.png)
install(FILES cantata22.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/22x22/apps RENAME cantata.png)
install(FILES cantata24.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/24x24/apps RENAME cantata.png)
install(FILES cantata32.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/32x32/apps RENAME cantata.png)
install(FILES cantata48.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/48x48/apps RENAME cantata.png)
install(FILES cantata64.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/64x64/apps RENAME cantata.png)
else (WIN32 OR APPLE)
macro (update_iconcache ICON_THEME)
# Update mtime of hicolor icon theme dir.
# We don't always have touch command (e.g. on Windows), so instead create
# and delete a temporary file in the theme dir.
install(CODE "
set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
if (NOT DESTDIR_VALUE)
file(WRITE \"${CMAKE_INSTALL_PREFIX}/share/icons/${ICON_THEME}/temp.txt\" \"update\")
file(REMOVE \"${CMAKE_INSTALL_PREFIX}/share/icons/${ICON_THEME}/temp.txt\")
endif (NOT DESTDIR_VALUE)
")
endmacro (update_iconcache)
if (NOT WIN32 AND NOT APPLE)
macro (update_iconcache ICON_THEME)
# Update mtime of hicolor icon theme dir.
# We don't always have touch command (e.g. on Windows), so instead create
# and delete a temporary file in the theme dir.
install(CODE "
set(DESTDIR_VALUE \"\$ENV{DESTDIR}\")
if (NOT DESTDIR_VALUE)
file(WRITE \"${CMAKE_INSTALL_PREFIX}/share/icons/${ICON_THEME}/temp.txt\" \"update\")
file(REMOVE \"${CMAKE_INSTALL_PREFIX}/share/icons/${ICON_THEME}/temp.txt\")
endif (NOT DESTDIR_VALUE)
")
endmacro (update_iconcache)
endif (NOT WIN32 AND NOT APPLE)
install(FILES cantata.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
install(FILES cantata16.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/16x16/apps RENAME cantata.png)
install(FILES cantata22.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/22x22/apps RENAME cantata.png)
install(FILES cantata24.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/24x24/apps RENAME cantata.png)
install(FILES cantata32.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps RENAME cantata.png)
install(FILES cantata48.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps RENAME cantata.png)
install(FILES cantata64.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps RENAME cantata.png)
install(FILES cantata.svg DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/scalable/apps)
install(FILES cantata16.png DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/16x16/apps RENAME cantata.png)
install(FILES cantata22.png DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/22x22/apps RENAME cantata.png)
install(FILES cantata24.png DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/24x24/apps RENAME cantata.png)
install(FILES cantata32.png DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/32x32/apps RENAME cantata.png)
install(FILES cantata48.png DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/48x48/apps RENAME cantata.png)
install(FILES cantata64.png DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/64x64/apps RENAME cantata.png)
update_iconcache(hicolor)
if (NOT WIN32 AND NOT APPLE)
update_iconcache(hicolor)
if (EXISTS /etc/lsb-release)
file(READ "/etc/lsb-release" LSB_RELEASE_CONTENTS)
string(REGEX MATCH "DISTRIB_ID=Ubuntu" IS_UBUNTU ${LSB_RELEASE_CONTENTS})
if (IS_UBUNTU)
set(INSTALL_UBUNTU_ICONS_DEFAULT ON)
else(IS_UBUNTU)
set(INSTALL_UBUNTU_ICONS_DEFAULT OFF)
endif(IS_UBUNTU)
else(EXISTS /etc/lsb-release)
if (EXISTS /etc/lsb-release)
file(READ "/etc/lsb-release" LSB_RELEASE_CONTENTS)
string(REGEX MATCH "DISTRIB_ID=Ubuntu" IS_UBUNTU ${LSB_RELEASE_CONTENTS})
if (IS_UBUNTU)
set(INSTALL_UBUNTU_ICONS_DEFAULT ON)
else(IS_UBUNTU)
set(INSTALL_UBUNTU_ICONS_DEFAULT OFF)
endif(EXISTS /etc/lsb-release)
option(INSTALL_UBUNTU_ICONS "Install the Ubuntu themed monochrome panel icons" ${INSTALL_UBUNTU_ICONS_DEFAULT})
endif(IS_UBUNTU)
else(EXISTS /etc/lsb-release)
set(INSTALL_UBUNTU_ICONS_DEFAULT OFF)
endif(EXISTS /etc/lsb-release)
option(INSTALL_UBUNTU_ICONS "Install the Ubuntu themed monochrome panel icons" ${INSTALL_UBUNTU_ICONS_DEFAULT})
if (INSTALL_UBUNTU_ICONS)
install(FILES trayicon-mono-dark.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/ubuntu-mono-light/apps/22 RENAME cantata-panel.svg)
install(FILES trayicon-mono-light.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/ubuntu-mono-dark/apps/22 RENAME cantata-panel.svg)
update_iconcache(ubuntu-mono-light)
update_iconcache(ubuntu-mono-dark)
endif (INSTALL_UBUNTU_ICONS)
if (INSTALL_UBUNTU_ICONS)
install(FILES trayicon-mono-dark.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/ubuntu-mono-light/apps/22 RENAME cantata-panel.svg)
install(FILES trayicon-mono-light.svg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/ubuntu-mono-dark/apps/22 RENAME cantata-panel.svg)
update_iconcache(ubuntu-mono-light)
update_iconcache(ubuntu-mono-dark)
endif (INSTALL_UBUNTU_ICONS)
endif (WIN32 OR APPLE)
#endif (ENABLE_KDE_SUPPORT)
endif (NOT WIN32 AND NOT APPLE)

2
mac/CMakeLists.txt
View File

@@ -1,5 +1,3 @@
set(MACOSX_BUNDLE_RESOURCES "${CMAKE_BINARY_DIR}/cantata.app/Contents/Resources")
install(FILES ${MACOSX_BUNDLE_ICON_FILE} DESTINATION ${MACOSX_BUNDLE_RESOURCES})
if (CANTATA_OXYGEN_DIR)

10
mac/icons/CMakeLists.txt
View File

@@ -204,10 +204,10 @@ set(OXYGEN_ICONS
foreach(ICON ${OXYGEN_ICONS})
get_filename_component(ICON_PATH ${ICON} PATH)
install(FILES ${CANTATA_OXYGEN_DIR}/${ICON} DESTINATION ${MACOSX_BUNDLE_RESOURCES}/icons/oxygen/${ICON_PATH})
install(FILES ${CANTATA_OXYGEN_DIR}/${ICON} DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/${ICON_PATH})
endforeach(ICON ${OXYGEN_ICONS})
install(FILES index.theme DESTINATION ${MACOSX_BUNDLE_RESOURCES}/icons/oxygen)
install(FILES "LICENSE.Creative Common Attribution-ShareAlike 3.0 License.html" DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen RENAME "Oxygen License (Creative Common Attribution-ShareAlike 3.0).html")
install(FILES LICENSE.LGPL_V3 DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen RENAME "Oxygen License (LGPL V3).txt")
install(FILES README DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen RENAME "Oxygen README.txt")
install(FILES index.theme DESTINATION ${CANTATA_ICON_INSTALL_PREFIX})
install(FILES "LICENSE.Creative Common Attribution-ShareAlike 3.0 License.html" DESTINATION ${CANTATA_ICON_INSTALL_PREFIX} RENAME "Oxygen License (Creative Common Attribution-ShareAlike 3.0).html")
install(FILES LICENSE.LGPL_V3 DESTINATION ${CANTATA_ICON_INSTALL_PREFIX} RENAME "Oxygen License (LGPL V3).txt")
install(FILES README DESTINATION ${CANTATA_ICON_INSTALL_PREFIX} RENAME "Oxygen README.txt")

8
online/icons/CMakeLists.txt
View File

@@ -1,5 +1,9 @@
set(CANTATA_INSTALL_ONLINE_ICONS bbc.svg cbc.svg npr.svg podcasts.png soundcloud.png)
if (WIN32)
install(FILES bbc.svg cbc.svg npr.svg podcasts.png soundcloud.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/)
install(FILES ${CANTATA_INSTALL_ONLINE_ICONS} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/)
elseif (APPLE)
install(FILES ${CANTATA_INSTALL_ONLINE_ICONS} DESTINATION ${MACOSX_BUNDLE_RESOURCES}/icons/)
else (WIN32)
install(FILES bbc.svg cbc.svg npr.svg podcasts.png soundcloud.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/icons/)
install(FILES ${CANTATA_INSTALL_ONLINE_ICONS} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/icons/)
endif (WIN32)

4
po/CMakeLists.txt
View File

@@ -59,7 +59,9 @@ else (ENABLE_KDE_SUPPORT)
DEPENDS ${_tsFile})
if (WIN32 OR ENABLE_UBUNTU)
install(FILES ${_qmFile} DESTINATION ${CMAKE_INSTALL_PREFIX}/translations/)
else (WIN32 OR ENABLE_UBUNTU)
elseif (APPLE)
install(FILES ${_qmFile} DESTINATION ${MACOSX_BUNDLE_RESOURCES}/translations/)
else (WIN32 OR APPLE OR ENABLE_UBUNTU)
install(FILES ${_qmFile} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cantata/translations/)
endif (WIN32 OR ENABLE_UBUNTU)
endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_lang}.po)

4
replaygain/CMakeLists.txt
View File

@@ -27,6 +27,10 @@ if (FFMPEG_FOUND OR MPG123_FOUND)
set(CMAKE_BUILD_TYPE "Release")
ADD_EXECUTABLE(cantata-replaygain WIN32 ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS} ${CANTATA_PO})
install(TARGETS cantata-replaygain DESTINATION ${CMAKE_INSTALL_PREFIX}/helpers)
elseif (APPLE)
set(CMAKE_BUILD_TYPE "Release")
ADD_EXECUTABLE(cantata-replaygain ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS} ${CANTATA_PO})
install(TARGETS cantata-replaygain DESTINATION ${MACOSX_BUNDLE_RESOURCES}/helpers)
else (WIN32)
ADD_EXECUTABLE(cantata-replaygain ${CANTATA_RG_SRCS} ${CANTATA_RG_MOC_SRCS})
install(TARGETS cantata-replaygain RUNTIME DESTINATION lib/cantata)

8
streams/icons/CMakeLists.txt
View File

@@ -1,5 +1,9 @@
set(CANTATA_INSTALL_STREAM_ICONS stream.png)
if (WIN32)
install(FILES stream.png DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/)
install(FILES ${CANTATA_INSTALL_STREAM_ICONS} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/)
elseif (APPLE)
install(FILES ${CANTATA_INSTALL_STREAM_ICONS} DESTINATION ${MACOSX_BUNDLE_RESOURCES}/icons/)
else (WIN32)
install(FILES stream.png DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/icons/)
install(FILES ${CANTATA_INSTALL_STREAM_ICONS} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/icons/)
endif (WIN32)

4
support/utils.cpp
View File

@@ -710,8 +710,10 @@ QString Utils::cacheDir(const QString &sub, bool create)
QString Utils::systemDir(const QString &sub)
{
#if defined Q_OS_WIN || defined Q_OS_MAC
#if defined Q_OS_WIN
return fixPath(QCoreApplication::applicationDirPath())+(sub.isEmpty() ? QString() : (sub+constDirSep));
#elif defined Q_OS_MAC
return fixPath(QCoreApplication::applicationDirPath())+QLatin1String("Contents/Resources/")+(sub.isEmpty() ? QString() : (sub+constDirSep));
#else
return fixPath(QString(INSTALL_PREFIX "/share/")+QCoreApplication::applicationName()+constDirSep+(sub.isEmpty() ? QString() : sub));
#endif

4
tags/CMakeLists.txt
View File

@@ -17,6 +17,10 @@ else (ENABLE_KDE_SUPPORT)
set(CMAKE_BUILD_TYPE "Release")
ADD_EXECUTABLE(cantata-tags WIN32 ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS})
install(TARGETS cantata-tags DESTINATION ${CMAKE_INSTALL_PREFIX}/helpers)
elseif (APPLE)
set(CMAKE_BUILD_TYPE "Release")
ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS})
install(TARGETS cantata-tags DESTINATION ${MACOSX_BUNDLE_RESOURCES}/helpers)
else (WIN32)
ADD_EXECUTABLE(cantata-tags ${CANTATA_TAGS_SRCS} ${CANTATA_TAGS_MOC_SRCS})
install(TARGETS cantata-tags RUNTIME DESTINATION lib/cantata)

10
windows/icons/CMakeLists.txt
View File

@@ -204,9 +204,9 @@ set(OXYGEN_ICONS
foreach(ICON ${OXYGEN_ICONS})
get_filename_component(ICON_PATH ${ICON} PATH)
install(FILES ${CANTATA_OXYGEN_DIR}/${ICON} DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen/${ICON_PATH})
install(FILES ${CANTATA_OXYGEN_DIR}/${ICON} DESTINATION ${CANTATA_ICON_INSTALL_PREFIX}/${ICON_PATH})
endforeach(ICON ${OXYGEN_ICONS})
install(FILES index.theme DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen)
install(FILES "LICENSE.Creative Common Attribution-ShareAlike 3.0 License.html" DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen RENAME "Oxygen License (Creative Common Attribution-ShareAlike 3.0).html")
install(FILES LICENSE.LGPL_V3 DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen RENAME "Oxygen License (LGPL V3).txt")
install(FILES README DESTINATION ${CMAKE_INSTALL_PREFIX}/icons/oxygen RENAME "Oxygen README.txt")
install(FILES index.theme DESTINATION ${CANTATA_ICON_INSTALL_PREFIX})
install(FILES "LICENSE.Creative Common Attribution-ShareAlike 3.0 License.html" DESTINATION ${CANTATA_ICON_INSTALL_PREFIX} RENAME "Oxygen License (Creative Common Attribution-ShareAlike 3.0).html")
install(FILES LICENSE.LGPL_V3 DESTINATION ${CANTATA_ICON_INSTALL_PREFIX} RENAME "Oxygen License (LGPL V3).txt")
install(FILES README DESTINATION ${CANTATA_ICON_INSTALL_PREFIX} RENAME "Oxygen README.txt")