From 5a9f4f9a89c65bd4020a284a5d06c5b9cb36d2b8 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Sun, 8 Dec 2024 17:45:52 +0800 Subject: [PATCH] revert and test --- flatpak/io.github.softfever.OrcaSlicer.yml | 9 ++------- version.inc | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/flatpak/io.github.softfever.OrcaSlicer.yml b/flatpak/io.github.softfever.OrcaSlicer.yml index 69f641efb9..0eb8b86c14 100755 --- a/flatpak/io.github.softfever.OrcaSlicer.yml +++ b/flatpak/io.github.softfever.OrcaSlicer.yml @@ -138,31 +138,26 @@ modules: - name: orca_deps buildsystem: simple - build-options: - env: - # Keep downloads in a persistent location - DEP_DOWNLOAD_DIR: /app/external-packages build-commands: # start build - | mkdir deps/build && cd deps/build cmake ../ \ -DDEP_WX_GTK3=ON \ - -DDEP_DOWNLOAD_DIR=/app/external-packages \ + -DDEP_DOWNLOAD_DIR=/run/build/orca_deps/external-packages \ -DCMAKE_PREFIX_PATH=/app \ -DDESTDIR=/app \ -DCMAKE_INSTALL_LIBDIR=/app/lib \ -DFLATPAK=ON \ -DCMAKE_INSTALL_PREFIX=/app cmake --build . - # Don't remove external-packages + rm -r /run/build/orca_deps/external-packages cleanup: - /app/include - "*.a" - "*.la" - /app/lib/cmake - - /app/external-packages # Clean up after build instead sources: # - diff --git a/version.inc b/version.inc index 7eb37fdde4..959a5a14d6 100644 --- a/version.inc +++ b/version.inc @@ -10,7 +10,7 @@ endif() if(NOT DEFINED BBL_INTERNAL_TESTING) set(BBL_INTERNAL_TESTING "0") endif() -set(SoftFever_VERSION "2.3.0-dev") +set(SoftFever_VERSION "2.35.0-dev") string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" SoftFever_VERSION_MATCH ${SoftFever_VERSION}) set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})