Use separate variable for cfg file name in CMAKE.

Signed-off-by: alex-z <blackslayer4@gmail.com>

diff --git a/NEXTCLOUD.cmake b/NEXTCLOUD.cmake
index 67b56ccc5c2d1407464ce5de451d3e1c0c297db3..b48ba5291be44635c4d38bebdeee12dd99ec39de 100644 (file)
--- 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 1d821d2b48509ac21b092e6d46f0abba0757a15f..5b91a83386476b9515d94f9d570619632c806ad0 100644 (file)
--- 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 4419bc8b18d01d467bee1a98a40ebd75c6c9d324..e9d3206c999dcfceb36a6e8d6cd275847e176742 100644 (file)
--- 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