Browse Source

Merge branch 'CURA-8831_fine_tune_recipe'

# Conflicts:
#	profiles/cura.jinja
pull/6/head
Jelle Spijker 4 years ago
parent
commit
708c40fcd4
  1. 10
      conan.conf
  2. 8
      profiles/cura.jinja
  3. 2
      profiles/cura_build.jinja

10
conan.conf

@ -1,8 +1,8 @@
[log]
run_to_output = True # environment CONAN_LOG_RUN_TO_OUTPUT
run_to_file = False # environment CONAN_LOG_RUN_TO_FILE
level = critical # environment CONAN_LOGGING_LEVEL
print_run_commands = False # environment CONAN_PRINT_RUN_COMMANDS
level = warn # environment CONAN_LOGGING_LEVEL
print_run_commands = True # environment CONAN_PRINT_RUN_COMMANDS
[general]
default_profile = default
@ -10,8 +10,10 @@ compression_level = 9 # environment CONAN_COMPRESSION_LEVEL
sysrequires_sudo = True # environment CONAN_SYSREQUIRES_SUDO
request_timeout = 60 # environment CONAN_REQUEST_TIMEOUT (seconds)
default_package_id_mode = full_package_mode # environment CONAN_DEFAULT_PACKAGE_ID_MODE
revisions_enabled = 1
scm_to_conandata = 1
revisions_enabled = True
scm_to_conandata = True
use_always_short_paths = True
config_install_interval = 1h
[storage]
path = ./data

8
profiles/cura.jinja

@ -3,16 +3,12 @@ include(default)
[build_requires]
[settings]
os='{{ {'Darwin': 'Macos'}.get(platform.system(), platform.system()) }}'
os_build='{{ {'Darwin': 'Macos'}.get(platform.system(), platform.system()) }}'
compiler.cppstd=17
{% if compiler == 'gcc' %}compiler.version=12
compiler.libcxx=libstdc++11
curaengine: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 %}
curaengine:compiler.cppstd=20
[options]
[env]

2
profiles/cura_build.jinja

@ -3,8 +3,6 @@ include(default)
[build_requires]
[settings]
os='{{ {'Darwin': 'Macos'}.get(platform.system(), platform.system()) }}'
os_build='{{ {'Darwin': 'Macos'}.get(platform.system(), platform.system()) }}'
compiler.cppstd=17
{% if compiler == 'gcc' %}compiler.libcxx=libstdc++11
{% elif compiler == 'apple-clang' %}compiler.libcxx=libc++

Loading…
Cancel
Save