Browse Source

Merge remote-tracking branch 'refs/remotes/origin/CURA-11622_conan_v2' into CURA-11622_conan_v2

pull/12/head
Erwan MATHIEU 1 year ago
parent
commit
876db08a0e
  1. 2
      profiles/cura.jinja
  2. 13
      profiles/cura_clang.jinja
  3. 8
      profiles/cura_wasm.jinja

2
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

13
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++"}

8
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

Loading…
Cancel
Save