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

Correct use SHARE_INSTALL_PREFIX

Browse Source
This commit is contained in:
Craig Drummond
2015-12-01 20:23:37 +00:00
parent ec82abe096
commit b5cb4ebea7
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config.h.cmake
View File

@@ -11,6 +11,7 @@
#define PACKAGE_STRING PACKAGE_NAME" @CANTATA_VERSION_FULL@"
#define PACKAGE_VERSION_STRING "@CANTATA_VERSION_WITH_SPIN@"
#define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
#define SHARE_INSTALL_PREFIX "@SHARE_INSTALL_PREFIX@"
#define ICON_INSTALL_PREFIX "@CANTATA_ICON_INSTALL_PREFIX@"
#cmakedefine ENABLE_DEVICES_SUPPORT 1

2
support/utils.cpp
View File

@@ -762,7 +762,7 @@ QString Utils::systemDir(const QString &sub)
#elif defined Q_OS_MAC
return fixPath(QCoreApplication::applicationDirPath())+QLatin1String("../Resources/")+(sub.isEmpty() ? QString() : (sub+constDirSep));
#else
return fixPath(QString(INSTALL_PREFIX "/share/")+QCoreApplication::applicationName()+constDirSep+(sub.isEmpty() ? QString() : sub));
return fixPath(QString(SHARE_INSTALL_PREFIX"/")+QCoreApplication::applicationName()+constDirSep+(sub.isEmpty() ? QString() : sub));
#endif
}