From 54a5d5e6059882ad735b3f9ae90d46fd348164d2 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Mon, 5 Aug 2024 14:23:54 -0400
Subject: [PATCH] improve flatpak building so it sets up the required repo
 automatically as well

---
 tools/lammps-gui/CMakeLists.txt | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/lammps-gui/CMakeLists.txt b/tools/lammps-gui/CMakeLists.txt
index 122aaad5e7..4c53c2f4c3 100644
--- a/tools/lammps-gui/CMakeLists.txt
+++ b/tools/lammps-gui/CMakeLists.txt
@@ -204,14 +204,19 @@ find_program(FLATPAK_BUILDER flatpak-builder DOC "Path to flatpak-builder comman
 if(FLATPAK_COMMAND AND FLATPAK_BUILDER)
   file(STRINGS ${LAMMPS_DIR}/src/version.h line REGEX LAMMPS_VERSION)
   string(REGEX REPLACE "#define LAMMPS_VERSION \"([0-9]+) ([A-Za-z][A-Za-z][A-Za-z])[A-Za-z]* ([0-9]+)\""
-                       "\\1\\2\\3" LAMMPS_RELEASE "${line}")
+                        "\\1\\2\\3" LAMMPS_RELEASE "${line}")
+  set(FLATPAK_BUNDLE "LAMMPS_GUI-Linux-amd64-${LAMMPS_RELEASE}.flatpak")
   add_custom_target(flatpak
-    COMMAND ${FLATPAK_BUILDER} --force-clean --verbose --ccache --repo=repo --user --default-branch=${LAMMPS_RELEASE}
-                   --install-deps-from=flathub flatpak-build ${LAMMPS_DIR}/tools/lammps-gui/org.lammps.lammps-gui.yml
+    COMMAND ${FLATPAK_COMMAND} --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
+    COMMAND ${FLATPAK_BUILDER} --force-clean --verbose --repo=${CMAKE_CURRENT_BINARY_DIR}/flatpak-repo
+                               --install-deps-from=flathub --state-dir=${CMAKE_CURRENT_BINARY_DIR}
+                               --user --ccache --default-branch=${LAMMPS_RELEASE}
+                               flatpak-build ${LAMMPS_DIR}/tools/lammps-gui/org.lammps.lammps-gui.yml
     COMMAND ${FLATPAK_COMMAND} build-bundle --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo --verbose
-                                      repo LAMMPS_GUI-Linux-amd64.flatpak org.lammps.lammps-gui ${LAMMPS_RELEASE}
+                               ${CMAKE_CURRENT_BINARY_DIR}/flatpak-repo
+                               ${FLATPAK_BUNDLE} org.lammps.lammps-gui ${LAMMPS_RELEASE}
     COMMENT "Create Flatpak bundle file of LAMMPS-GUI and LAMMPS"
-    BYPRODUCT LAMMPS-Linux-amd64.flatpak
+    BYPRODUCT ${FLATPAK_BUNDLE}
     WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
   )
 else()