revert and test
This commit is contained in:
parent
ad4725342a
commit
5a9f4f9a89
2 changed files with 3 additions and 8 deletions
|
@ -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:
|
||||
# -
|
||||
|
|
|
@ -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})
|
||||
|
|
Loading…
Reference in a new issue