Fix remaining uses of KEEPASSXC_SNAP_BUILD

keepassxreboot · Oct 17, 2017 · 6f26a49 · 6f26a49
1 parent acb6300
commit 6f26a49
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -53,10 +53,15 @@ set(KEEPASSXC_VERSION_PATCH "1")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 
 # Distribution info
+set(KEEPASSXC_DIST True)
 set(KEEPASSXC_DIST_TYPE "Other" CACHE STRING "KeePassXC Distribution type")
 set_property(CACHE KEEPASSXC_DIST_TYPE PROPERTY STRINGS Snap AppImage Other)
-if(NOT KEEPASSXC_DIST_TYPE STREQUAL "Other")
-  set(KEEPASSXC_DIST True)
+if(KEEPASSXC_DIST_TYPE STREQUAL "Snap")
+  set(KEEPASSXC_DIST_SNAP True)
+elseif(KEEPASSXC_DIST_TYPE STREQUAL "AppImage")
+  set(KEEPASSXC_DIST_APPIMAGE True)
+elseif(KEEPASSXC_DIST_TYPE STREQUAL "Other")
+  unset(KEEPASSXC_DIST)
 endif()
 
 if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")

diff --git a/src/config-keepassx.h.cmake b/src/config-keepassx.h.cmake
@@ -18,6 +18,8 @@
 
 #cmakedefine KEEPASSXC_DIST
 #cmakedefine KEEPASSXC_DIST_TYPE "@KEEPASSXC_DIST_TYPE@"
+#cmakedefine KEEPASSXC_DIST_SNAP
+#cmakedefine KEEPASSXC_DIST_APPIMAGE
 
 #cmakedefine HAVE_PR_SET_DUMPABLE 1
 #cmakedefine HAVE_RLIMIT_CORE 1

diff --git a/src/core/FilePath.cpp b/src/core/FilePath.cpp
@@ -91,7 +91,7 @@ QString FilePath::pluginPath(const QString& name)
 
 QIcon FilePath::applicationIcon()
 {
-#ifdef KEEPASSXC_SNAP_BUILD
+#ifdef KEEPASSXC_DIST_SNAP
     return icon("apps", "keepassxc", false);
 #else
     return icon("apps", "keepassxc");
@@ -100,7 +100,7 @@ QIcon FilePath::applicationIcon()
 
 QIcon FilePath::trayIconLocked()
 {
-#ifdef KEEPASSXC_SNAP_BUILD
+#ifdef KEEPASSXC_DIST_SNAP
     return icon("apps", "keepassxc-locked", false);
 #else
     return icon("apps", "keepassxc-locked");
@@ -109,7 +109,7 @@ QIcon FilePath::trayIconLocked()
 
 QIcon FilePath::trayIconUnlocked()
 {
-#ifdef KEEPASSXC_SNAP_BUILD
+#ifdef KEEPASSXC_DIST_SNAP
     return icon("apps", "keepassxc-unlocked", false);
 #else
     return icon("apps", "keepassxc-unlocked");