From 79911ab1888510c84e72891947376a38ee0c8a47 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 3 Aug 2023 00:24:54 +0800 Subject: [PATCH] fix build error on Ubuntu and update deps --- .github/workflows/build_linux.yml | 6 +++--- .github/workflows/build_mac_arm64.yml | 6 +++--- .github/workflows/build_mac_x64.yml | 6 +++--- CMakeLists.txt | 1 + 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml index 043c34fc1..651d99298 100644 --- a/.github/workflows/build_linux.yml +++ b/.github/workflows/build_linux.yml @@ -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 diff --git a/.github/workflows/build_mac_arm64.yml b/.github/workflows/build_mac_arm64.yml index 1316ee180..8ecd70aea 100644 --- a/.github/workflows/build_mac_arm64.yml +++ b/.github/workflows/build_mac_arm64.yml @@ -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 diff --git a/.github/workflows/build_mac_x64.yml b/.github/workflows/build_mac_x64.yml index c3544f56e..49cebba91 100644 --- a/.github/workflows/build_mac_x64.yml +++ b/.github/workflows/build_mac_x64.yml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 1b6d8d3e3..5fb93c5bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 ()