fix build error on Ubuntu and update deps
This commit is contained in:
parent
12195c722f
commit
79911ab188
4 changed files with 10 additions and 9 deletions
6
.github/workflows/build_linux.yml
vendored
6
.github/workflows/build_linux.yml
vendored
|
@ -62,11 +62,11 @@ jobs:
|
|||
run: |
|
||||
mkdir -p ${{ github.workspace }}/deps/build
|
||||
mkdir -p ${{ github.workspace }}/deps/build/destdir
|
||||
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Jun_2023/OrcaSlicer_dep_ubuntu_11-06-2023.tar.gz
|
||||
tar -zxf OrcaSlicer_dep_ubuntu_11-06-2023.tar.gz -C ${{ github.workspace }}/deps/build
|
||||
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2023.08/OrcaSlicer_dep_ubuntu_02-08-2023.tar.gz
|
||||
tar -zxf OrcaSlicer_dep_ubuntu_02-08-2023.tar.gz -C ${{ github.workspace }}/deps/build
|
||||
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/destdir
|
||||
ls -l ${{ github.workspace }}/deps/build/destdir
|
||||
rm OrcaSlicer_dep_ubuntu_11-06-2023.tar.gz
|
||||
rm OrcaSlicer_dep_ubuntu_02-08-2023.tar.gz
|
||||
|
||||
|
||||
- name: Build Studio
|
||||
|
|
6
.github/workflows/build_mac_arm64.yml
vendored
6
.github/workflows/build_mac_arm64.yml
vendored
|
@ -52,11 +52,11 @@ jobs:
|
|||
- name: Download and extract deps
|
||||
working-directory: ${{ github.workspace }}
|
||||
run: |
|
||||
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
|
||||
tar -zxf OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build_arm64
|
||||
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2023.08/OrcaSlicer_dep_mac_arm64_02-08-2023.tar.gz
|
||||
tar -zxf OrcaSlicer_dep_mac_arm64_02-08-2023.tar.gz -C ${{ github.workspace }}/deps/build_arm64
|
||||
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
|
||||
ls -l ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
|
||||
rm OrcaSlicer_dep_mac_arm64_11-03-2023.tar.gz
|
||||
rm OrcaSlicer_dep_mac_arm64_02-08-2023.tar.gz
|
||||
|
||||
|
||||
- name: Build studio
|
||||
|
|
6
.github/workflows/build_mac_x64.yml
vendored
6
.github/workflows/build_mac_x64.yml
vendored
|
@ -53,11 +53,11 @@ jobs:
|
|||
- name: Download and extract deps
|
||||
working-directory: ${{ github.workspace }}
|
||||
run: |
|
||||
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/OrcaSlicer_deps_Mar/OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
|
||||
tar -zxf OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz -C ${{ github.workspace }}/deps/build_x86_64
|
||||
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2023.08/OrcaSlicer_dep_mac_x86_64_02-08-2023.tar.gz
|
||||
tar -zxf OrcaSlicer_dep_mac_x86_64_02-08-2023.tar.gz -C ${{ github.workspace }}/deps/build_x86_64
|
||||
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
|
||||
ls -l ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
|
||||
rm OrcaSlicer_dep_mac_x86_64_11-03-2023.tar.gz
|
||||
rm OrcaSlicer_dep_mac_x86_64_02-08-2023.tar.gz
|
||||
|
||||
|
||||
- name: Build studio
|
||||
|
|
|
@ -503,6 +503,7 @@ find_package(glfw3 REQUIRED)
|
|||
|
||||
# Find the Cereal serialization library
|
||||
find_package(cereal REQUIRED)
|
||||
set_target_properties(cereal PROPERTIES IMPORTED_GLOBAL TRUE)
|
||||
if (NOT TARGET cereal::cereal)
|
||||
add_library(cereal::cereal ALIAS cereal)
|
||||
endif ()
|
||||
|
|
Loading…
Reference in a new issue