From 2f994207b1a9c74a9aa791515d0f528d7e06768c Mon Sep 17 00:00:00 2001 From: SoftFever Date: Tue, 14 Mar 2023 23:47:21 +0800 Subject: [PATCH] fix linux build --- Containerfile | 4 ++-- deps/CMakeLists.txt | 8 ++++---- resources/images/OrcaSlicer.png | Bin 0 -> 3026 bytes resources/images/OrcaSlicer_192px.png | Bin 0 -> 3706 bytes 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 resources/images/OrcaSlicer.png create mode 100644 resources/images/OrcaSlicer_192px.png diff --git a/Containerfile b/Containerfile index 03b16f7a6..42937d8a7 100644 --- a/Containerfile +++ b/Containerfile @@ -52,9 +52,9 @@ RUN apt-get update && apt-get install -y \ file \ sudo -COPY ./ BambuStudio +COPY ./ OrcaSlicer -WORKDIR BambuStudio +WORKDIR OrcaSlicer # These can run together, but we run them seperate for podman caching # Update System dependencies diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index 3fb3c5a27..43a976444 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -23,10 +23,6 @@ project(OrcaSlicer-deps) cmake_minimum_required(VERSION 3.2) -if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP - cmake_policy(SET CMP0135 NEW) -endif() - include(ExternalProject) include(ProcessorCount) @@ -42,6 +38,10 @@ option(DEP_DEBUG "Build debug variants (only applicable on Windows)" ON) if(CMAKE_SYSTEM_NAME STREQUAL "Linux") option(DEP_WX_GTK3 "Build wxWidgets against GTK3" OFF) +else() + if(POLICY CMP0135) # DOWNLOAD_EXTRACT_TIMESTAMP + cmake_policy(SET CMP0135 NEW) + endif() endif() set(IS_CROSS_COMPILE FALSE) diff --git a/resources/images/OrcaSlicer.png b/resources/images/OrcaSlicer.png new file mode 100644 index 0000000000000000000000000000000000000000..1af136da060cd7a625a19493ba7db86171ccf33f GIT binary patch literal 3026 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 literal 0 HcmV?d00001 diff --git a/resources/images/OrcaSlicer_192px.png b/resources/images/OrcaSlicer_192px.png new file mode 100644 index 0000000000000000000000000000000000000000..f92201bc628d3826bbcd7696a4a246312ba2b56e GIT binary patch literal 3706 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 Y{wQy