ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve flatpak building so it sets up the required repo automatically as well

Browse Source
This commit is contained in:
Axel Kohlmeyer
2024-08-05 14:23:54 -04:00
parent b094113e7a
commit 54a5d5e605
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/lammps-gui/CMakeLists.txt
View File

@ -204,14 +204,19 @@ find_program(FLATPAK_BUILDER flatpak-builder DOC "Path to flatpak-builder comman
if(FLATPAK_COMMAND AND FLATPAK_BUILDER) if(FLATPAK_COMMAND AND FLATPAK_BUILDER)
file(STRINGS ${LAMMPS_DIR}/src/version.h line REGEX LAMMPS_VERSION) 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]+)\"" 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 add_custom_target(flatpak
COMMAND ${FLATPAK_BUILDER} --force-clean --verbose --ccache --repo=repo --user --default-branch=${LAMMPS_RELEASE} COMMAND ${FLATPAK_COMMAND} --user remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
--install-deps-from=flathub flatpak-build ${LAMMPS_DIR}/tools/lammps-gui/org.lammps.lammps-gui.yml 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 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" COMMENT "Create Flatpak bundle file of LAMMPS-GUI and LAMMPS"
BYPRODUCT LAMMPS-Linux-amd64.flatpak BYPRODUCT ${FLATPAK_BUNDLE}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
) )
else() else()