Browse Source

Merge remote-tracking branch 'origin/master' into runner/macOS/X64

# Conflicts:
#	global.conf
#	profiles/cura.jinja
runner/macOS/X64
Jelle Spijker 3 years ago
parent
commit
591007a967
  1. 1
      global.conf
  2. 22
      profiles/cura.jinja

1
global.conf

@ -3,3 +3,4 @@ core:default_build_profile = cura_build.jinja
tools.cmake.cmaketoolchain:generator = Ninja
tools.env.virtualenv:auto_use = True
tools.gnu:define_libcxx11_abi = True
tools.build:skip_test = False

22
profiles/cura.jinja

@ -0,0 +1,22 @@
include(default)
[build_requires]
[settings]
compiler.cppstd=17
curaengine:compiler.cppstd=20
curaengine*:compiler.cppstd=20
curaengine_plugin_infill_generate:compiler.cppstd=20
curaengine_plugin_gradual_flow:compiler.cppstd=20
curaengine_grpc_definitions:compiler.cppstd=20
scripta:compiler.cppstd=20
umspatial*:compiler.cppstd=20
{% if compiler == 'gcc' %}compiler.libcxx=libstdc++11
{% elif compiler == 'apple-clang' %}compiler.libcxx=libc++
{% elif compiler == 'Visual Studio' %}compiler.toolset=v143
{% endif %}
[options]
[env]
[conf]
Loading…
Cancel
Save