diff --git a/profiles/cura.jinja b/profiles/cura.jinja index 623c4ad..bc2c743 100644 --- a/profiles/cura.jinja +++ b/profiles/cura.jinja @@ -9,7 +9,7 @@ curaengine_grpc_definitions*:compiler.cppstd=20 scripta*:compiler.cppstd=20 umspatial*:compiler.cppstd=20 dulcificum*:compiler.cppstd=20 -cura_settings*:compiler.cppstd=20 +curator*:compiler.cppstd=20 [options] asio-grpc/*:local_allocator=recycling_allocator diff --git a/profiles/cura_clang.jinja b/profiles/cura_clang.jinja new file mode 100644 index 0000000..fc7eaaa --- /dev/null +++ b/profiles/cura_clang.jinja @@ -0,0 +1,13 @@ +include(cura.jinja) + +[tool_requires] + +[settings] +compiler=clang +compiler.version=18 +compiler.libcxx=libstdc++11 + +[options] + +[conf] +tools.build:compiler_executables={"c":"clang", "cpp":"clang++"} diff --git a/profiles/cura_wasm.jinja b/profiles/cura_wasm.jinja index bfbca96..372fc79 100644 --- a/profiles/cura_wasm.jinja +++ b/profiles/cura_wasm.jinja @@ -1,7 +1,6 @@ include(cura.jinja) [tool_requires] -# change to main once merged https://github.com/Ultimaker/conan-ultimaker-index/pull/14 emsdk/3.1.65@ultimaker/stable nodejs/20.16.0@ultimaker/stable @@ -13,5 +12,8 @@ arch=wasm tools.build:skip_test=True [options] -curaengine:enable_plugins=False -curaengine:enable_arcus=False +curaengine/*:enable_plugins=False +curaengine/*:enable_arcus=False +curator/*:with_cura_resources=True +curator/*:disable_logging=True +libzip/*:crypto=False