Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-01-14 00:39:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining uses of KEEPASSXC_SNAP_BUILD

Browse Source
This commit is contained in:
Janek Bevendorff 2017-10-17 12:56:42 +02:00
parent 6d433fecef
commit ec8c99c3b2
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -53,10 +53,15 @@ set(KEEPASSXC_VERSION_PATCH "1")
set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}") set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
# Distribution info # Distribution info
set(KEEPASSXC_DIST True)
set(KEEPASSXC_DIST_TYPE "Other" CACHE STRING "KeePassXC Distribution type") set(KEEPASSXC_DIST_TYPE "Other" CACHE STRING "KeePassXC Distribution type")
set_property(CACHE KEEPASSXC_DIST_TYPE PROPERTY STRINGS Snap AppImage Other) set_property(CACHE KEEPASSXC_DIST_TYPE PROPERTY STRINGS Snap AppImage Other)
if(NOT KEEPASSXC_DIST_TYPE STREQUAL "Other") if(KEEPASSXC_DIST_TYPE STREQUAL "Snap")
set(KEEPASSXC_DIST True) 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() endif()
if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")

2
src/config-keepassx.h.cmake
View File

@ -18,6 +18,8 @@
#cmakedefine KEEPASSXC_DIST #cmakedefine KEEPASSXC_DIST
#cmakedefine KEEPASSXC_DIST_TYPE "@KEEPASSXC_DIST_TYPE@" #cmakedefine KEEPASSXC_DIST_TYPE "@KEEPASSXC_DIST_TYPE@"
#cmakedefine KEEPASSXC_DIST_SNAP
#cmakedefine KEEPASSXC_DIST_APPIMAGE
#cmakedefine HAVE_PR_SET_DUMPABLE 1 #cmakedefine HAVE_PR_SET_DUMPABLE 1
#cmakedefine HAVE_RLIMIT_CORE 1 #cmakedefine HAVE_RLIMIT_CORE 1

6
src/core/FilePath.cpp
View File

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