From f1523bd6d3285c506af0ab1da7d958841cc60583 Mon Sep 17 00:00:00 2001 From: GrimQuagle Date: Thu, 13 Feb 2025 10:56:17 -0600 Subject: [PATCH] Moved Arcus break workaround from cura.jinja to installer.jinja --- profiles/cura.jinja | 5 ----- profiles/installer.jinja | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/profiles/cura.jinja b/profiles/cura.jinja index 695fafb..310c950 100644 --- a/profiles/cura.jinja +++ b/profiles/cura.jinja @@ -14,11 +14,6 @@ curaengine*:compiler.cppstd=20 curaengine_plugin_infill_generate*:compiler.cppstd=20 curaengine_plugin_gradual_flow*:compiler.cppstd=20 curaengine_grpc_definitions*:compiler.cppstd=20 -{% if platform.system() == 'Windows' %} -# FIXME: Resolve Arcus null reference caused by MSVC 19.40 -# https://github.com/microsoft/STL/releases/tag/vs-2022-17.10 -arcus*:compiler.version=193 -{% endif %} scripta*:compiler.cppstd=20 umspatial*:compiler.cppstd=20 dulcificum*:compiler.cppstd=20 diff --git a/profiles/installer.jinja b/profiles/installer.jinja index 40fd3f8..8ac8f68 100644 --- a/profiles/installer.jinja +++ b/profiles/installer.jinja @@ -18,5 +18,10 @@ clipper/*:sentry_project=curaengine [settings] curaengine/*:build_type=RelWithDebInfo +{% if platform.system() == 'Windows' %} +# FIXME: Resolve Arcus null reference caused by MSVC 19.40 +# https://github.com/microsoft/STL/releases/tag/vs-2022-17.10 +arcus/*:compiler.version=193 +{% endif %} arcus/*:build_type=RelWithDebInfo clipper/*:build_type=RelWithDebInfo