From 90b455bbacdbdcb2f2eb39d51386d4fc0a8bf152 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 14 Dec 2024 08:39:06 -0500 Subject: [PATCH] small LAMMPS-GUI flatpak build updates --- tools/lammps-gui/CMakeLists.txt | 6 ++---- tools/lammps-gui/lammps-gui.appdata.xml | 3 +++ tools/lammps-gui/org.lammps.lammps-gui.yml | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/lammps-gui/CMakeLists.txt b/tools/lammps-gui/CMakeLists.txt index 7de32c71ce..5ac23daac7 100644 --- a/tools/lammps-gui/CMakeLists.txt +++ b/tools/lammps-gui/CMakeLists.txt @@ -86,9 +86,7 @@ else() add_compile_options(/wd4244) add_compile_options(/wd4267) add_compile_options(/wd4250) - if(LAMMPS_EXCEPTIONS) - add_compile_options(/EHsc) - endif() + add_compile_options(/EHsc) endif() add_compile_definitions(_CRT_SECURE_NO_WARNINGS) endif() @@ -207,7 +205,7 @@ 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}") - set(FLATPAK_BUNDLE "LAMMPS_GUI-Linux-amd64-${LAMMPS_RELEASE}.flatpak") + set(FLATPAK_BUNDLE "LAMMPS-Linux-x86_64-GUI-${LAMMPS_RELEASE}.flatpak") add_custom_target(flatpak 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 diff --git a/tools/lammps-gui/lammps-gui.appdata.xml b/tools/lammps-gui/lammps-gui.appdata.xml index 4c8843957e..1f74fc479c 100644 --- a/tools/lammps-gui/lammps-gui.appdata.xml +++ b/tools/lammps-gui/lammps-gui.appdata.xml @@ -56,6 +56,9 @@ + move cursor to end of log buffer before inserting new text + remove empirical filter to remove outliers from corrupted data + change tutorial download URL to tutorial website diff --git a/tools/lammps-gui/org.lammps.lammps-gui.yml b/tools/lammps-gui/org.lammps.lammps-gui.yml index 911f5044ed..dae6ecae31 100644 --- a/tools/lammps-gui/org.lammps.lammps-gui.yml +++ b/tools/lammps-gui/org.lammps.lammps-gui.yml @@ -109,4 +109,4 @@ modules: sources: - type: git url: https://github.com/lammps/lammps.git - branch: maintenance + branch: stable