From: alex-z Date: Mon, 7 Nov 2022 09:00:23 +0000 (+0100) Subject: Use separate variable for cfg file name in CMAKE. X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~11^2~156^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ba9d3269e387a639f462abaa3f47de58729a07cc;p=nextcloud-desktop.git Use separate variable for cfg file name in CMAKE. Signed-off-by: alex-z --- diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake index 67b56ccc5..b48ba5291 100644 --- a/NEXTCLOUD.cmake +++ b/NEXTCLOUD.cmake @@ -1,6 +1,7 @@ set( APPLICATION_NAME "Nextcloud" ) set( APPLICATION_SHORTNAME "Nextcloud" ) set( APPLICATION_EXECUTABLE "nextcloud" ) +set( APPLICATION_CONFIG_NAME "${APPLICATION_EXECUTABLE}" ) set( APPLICATION_DOMAIN "nextcloud.com" ) set( APPLICATION_VENDOR "Nextcloud GmbH" ) set( APPLICATION_UPDATE_URL "https://updates.nextcloud.org/client/" CACHE STRING "URL for updater" ) diff --git a/config.h.in b/config.h.in index 1d821d2b4..5b91a8338 100644 --- a/config.h.in +++ b/config.h.in @@ -17,6 +17,7 @@ #cmakedefine APPLICATION_REV_DOMAIN "@APPLICATION_REV_DOMAIN@" #cmakedefine APPLICATION_SHORTNAME "@APPLICATION_SHORTNAME@" #cmakedefine APPLICATION_EXECUTABLE "@APPLICATION_EXECUTABLE@" +#cmakedefine APPLICATION_CONFIG_NAME "@APPLICATION_CONFIG_NAME@" #cmakedefine APPLICATION_UPDATE_URL "@APPLICATION_UPDATE_URL@" #cmakedefine APPLICATION_HELP_URL "@APPLICATION_HELP_URL@" #cmakedefine APPLICATION_ICON_NAME "@APPLICATION_ICON_NAME@" diff --git a/src/libsync/theme.cpp b/src/libsync/theme.cpp index 4419bc8b1..e9d3206c9 100644 --- a/src/libsync/theme.cpp +++ b/src/libsync/theme.cpp @@ -196,7 +196,7 @@ QString Theme::version() const QString Theme::configFileName() const { - return QStringLiteral(APPLICATION_EXECUTABLE ".cfg"); + return QStringLiteral(APPLICATION_CONFIG_NAME ".cfg"); } #ifndef TOKEN_AUTH_ONLY