From b5cb4ebea7faa9f6bd2d95fc7fd585b14bd86ec2 Mon Sep 17 00:00:00 2001 From: Craig Drummond Date: Tue, 1 Dec 2015 20:23:37 +0000 Subject: [PATCH] Correct use SHARE_INSTALL_PREFIX --- config.h.cmake | 1 + support/utils.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/config.h.cmake b/config.h.cmake index fbf2e1eee..4aeb108de 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -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 diff --git a/support/utils.cpp b/support/utils.cpp index 02d30b7de..3e72431c6 100644 --- a/support/utils.cpp +++ b/support/utils.cpp @@ -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 }