From 4ffe2602283f65c6f20660ded189352c55b1fb35 Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 19 Mar 2026 15:48:32 +0800 Subject: [PATCH 1/2] update cmake to 4.3.x --- .github/workflows/build_all.yml | 4 +++- .github/workflows/build_deps.yml | 4 +++- .github/workflows/build_orca.yml | 4 +++- deps/OCCT/OCCT.cmake | 1 + 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 41fe9d2302..452e7cfafd 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -114,7 +114,9 @@ jobs: name: ${{ github.sha }}-tests - uses: lukka/get-cmake@latest with: - cmakeVersion: "~3.28.0" # use most recent 3.28.x version + cmakeVersion: "~4.3.0" # use most recent 4.3.x version + useLocalCache: true # <--= Use the local cache (default is 'false'). + useCloudCache: false # <--= Ditch the cloud cache (default is 'true'). - name: Unpackage and Run Unit Tests timeout-minutes: 20 run: | diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 0e21091be4..63505b187c 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -46,7 +46,9 @@ jobs: - uses: lukka/get-cmake@latest with: - cmakeVersion: "~3.28.0" # use most recent 3.28.x version + cmakeVersion: "~4.3.0" # use most recent 4.3.x version + useLocalCache: true # <--= Use the local cache (default is 'false'). + useCloudCache: false # <--= Ditch the cloud cache (default is 'true'). - name: setup dev on Windows if: inputs.os == 'windows-latest' diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 3cc89d30a7..5c6492ded6 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -44,7 +44,9 @@ jobs: - uses: lukka/get-cmake@latest with: - cmakeVersion: "~3.28.0" # use most recent 3.28.x version + cmakeVersion: "~4.3.0" # use most recent 4.3.x version + useLocalCache: true # <--= Use the local cache (default is 'false'). + useCloudCache: false # <--= Ditch the cloud cache (default is 'true'). - name: Get the version and date on Ubuntu and macOS if: inputs.os != 'windows-latest' diff --git a/deps/OCCT/OCCT.cmake b/deps/OCCT/OCCT.cmake index 98c6efc98d..b4cd9facd2 100644 --- a/deps/OCCT/OCCT.cmake +++ b/deps/OCCT/OCCT.cmake @@ -16,6 +16,7 @@ orcaslicer_add_cmake_project(OCCT #DEPENDS dep_Boost DEPENDS ${FREETYPE_PKG} CMAKE_ARGS + -DCMAKE_CXX_STANDARD=17 -DBUILD_LIBRARY_TYPE=${library_build_type} -DUSE_TK=OFF -DUSE_TBB=OFF From 838605690b289c989ac81d6d509cae57475cb2fb Mon Sep 17 00:00:00 2001 From: SoftFever Date: Thu, 19 Mar 2026 16:08:44 +0800 Subject: [PATCH 2/2] minor change --- .github/workflows/build_all.yml | 2 +- .github/workflows/build_deps.yml | 2 +- .github/workflows/build_orca.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 452e7cfafd..2bf01a0f65 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -116,7 +116,7 @@ jobs: with: cmakeVersion: "~4.3.0" # use most recent 4.3.x version useLocalCache: true # <--= Use the local cache (default is 'false'). - useCloudCache: false # <--= Ditch the cloud cache (default is 'true'). + useCloudCache: true - name: Unpackage and Run Unit Tests timeout-minutes: 20 run: | diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index 63505b187c..b43e71e535 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -48,7 +48,7 @@ jobs: with: cmakeVersion: "~4.3.0" # use most recent 4.3.x version useLocalCache: true # <--= Use the local cache (default is 'false'). - useCloudCache: false # <--= Ditch the cloud cache (default is 'true'). + useCloudCache: true - name: setup dev on Windows if: inputs.os == 'windows-latest' diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 5c6492ded6..ac85a0805b 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -46,8 +46,8 @@ jobs: with: cmakeVersion: "~4.3.0" # use most recent 4.3.x version useLocalCache: true # <--= Use the local cache (default is 'false'). - useCloudCache: false # <--= Ditch the cloud cache (default is 'true'). - + useCloudCache: true + - name: Get the version and date on Ubuntu and macOS if: inputs.os != 'windows-latest' run: |