From 6d433fecef375ca869eea0cba64e4ed7c895619a Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Mon, 16 Oct 2017 17:51:16 +0200 Subject: [PATCH] Set KEEPASSXC_DIST_TYPE when building AppImages and Snaps --- release-tool | 3 ++- snapcraft.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/release-tool b/release-tool index 24d64f902..351630694 100755 --- a/release-tool +++ b/release-tool @@ -598,7 +598,8 @@ build() { # Building on Linux without Docker container logInfo "Configuring build..." cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \ - -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" "$SRC_DIR" + -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" \ + -DKEEPASSXC_DIST_TYPE=AppImage "$SRC_DIR" logInfo "Compiling sources..." make $MAKE_OPTIONS diff --git a/snapcraft.yaml b/snapcraft.yaml index c73b53289..7062802d3 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -24,7 +24,7 @@ parts: configflags: - -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX=/usr - - -DKEEPASSXC_SNAP_BUILD=ON + - -DKEEPASSXC_DIST_TYPE=Snap - -DWITH_TESTS=OFF - -DWITH_XC_AUTOTYPE=ON - -DWITH_XC_HTTP=ON