Ver código fonte

Use separate variable for cfg file name in CMAKE.

Signed-off-by: alex-z <blackslayer4@gmail.com>
alex-z 3 anos atrás
pai
commit
ba9d3269e3
3 arquivos alterados com 3 adições e 1 exclusões
  1. 1 0
      NEXTCLOUD.cmake
  2. 1 0
      config.h.in
  3. 1 1
      src/libsync/theme.cpp

+ 1 - 0
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" )

+ 1 - 0
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@"

+ 1 - 1
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