From 3048b86c99f4e7c4551fd01a7018f8a123131d93 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 10 Dec 2024 17:43:43 +0100 Subject: [PATCH] Use curator to build curator Contribute to NP-637 --- profiles/cura_build.jinja | 5 +++++ profiles/cura_wasm.jinja | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/profiles/cura_build.jinja b/profiles/cura_build.jinja index de80517..d5afb9a 100644 --- a/profiles/cura_build.jinja +++ b/profiles/cura_build.jinja @@ -2,3 +2,8 @@ include(default) [settings] compiler.cppstd=17 +curator/*:compiler.cppstd=20 + +[options] +curator/*:with_cura_resources=True +curator/*:with_cura_ted_resources=True diff --git a/profiles/cura_wasm.jinja b/profiles/cura_wasm.jinja index 0e9a76b..cebe419 100644 --- a/profiles/cura_wasm.jinja +++ b/profiles/cura_wasm.jinja @@ -3,6 +3,7 @@ include(cura.jinja) [tool_requires] emsdk/3.1.65@ultimaker/stable nodejs/20.16.0@ultimaker/stable +curator/[>=0.5.0-beta.1]@ultimaker/np_637 [settings] os=Emscripten @@ -11,10 +12,10 @@ arch=wasm [conf] tools.build:skip_test=True tools.cmake.cmake_layout:build_folder_vars=['settings.os'] -{% if os.getenv('CI') == 'true' %} -user.curator:resource_path="{% os.getenv('GITHUB_WORKSPACE') %}/resources" -user.curator:fdm_materials_path="{% os.getenv('GITHUB_WORKSPACE') %}/resources" -{% endif %} +{#{% if os.getenv('CI') == 'true' %}#} +{#user.curator:resource_path="{% os.getenv('GITHUB_WORKSPACE') %}/resources"#} +{#user.curator:fdm_materials_path="{% os.getenv('GITHUB_WORKSPACE') %}/resources"#} +{#{% endif %}#} [options] curaengine/*:enable_plugins=False