Skip to content

Commit 51e7e91

Browse files
committed
Use (short) LAMMPS version string as default branch for flatpak
1 parent b546006 commit 51e7e91

File tree

3 files changed

+3
-8
lines changed

3 files changed

+3
-8
lines changed

tools/lammps-gui/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,10 @@ endif()
202202
find_program(FLATPAK_COMMAND flatpak DOC "Path to flatpak command")
203203
find_program(FLATPAK_BUILDER flatpak-builder DOC "Path to flatpak-builder command")
204204
if(FLATPAK_COMMAND AND FLATPAK_BUILDER)
205+
file(STRINGS ${LAMMPS_DIR}/src/version.h line REGEX LAMMPS_VERSION)
206+
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}")
205207
add_custom_target(flatpak
206-
COMMAND ${FLATPAK_BUILDER} --force-clean --verbose --ccache --repo=repo --user --install-deps-from=flathub flatpak-build ${LAMMPS_DIR}/tools/lammps-gui/org.lammps.lammps-gui.yml
208+
COMMAND ${FLATPAK_BUILDER} --force-clean --default-branch=${LAMMPS_RELEASE} --verbose --ccache --repo=repo --user --install-deps-from=flathub flatpak-build ${LAMMPS_DIR}/tools/lammps-gui/org.lammps.lammps-gui.yml
207209
COMMAND ${FLATPAK_COMMAND} build-bundle --runtime-repo=https://flathub.org/repo/flathub.flatpakrepo --verbose
208210
repo LAMMPS_GUI-Linux-amd64.flatpak org.lammps.lammps-gui
209211
COMMENT "Create Flatpak bundle file of LAMMPS-GUI and LAMMPS"

tools/lammps-gui/flatpak/.gitignore

Lines changed: 0 additions & 4 deletions
This file was deleted.

tools/lammps-gui/flatpak/build-lammps-gui-flatpak.sh

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)