Browse Source

Use global.conf and remove conan.conf

Contributes to CURA-9365
pull/2/head
j.spijker@ultimaker.com 4 years ago committed by jspijker
parent
commit
58bb090838
  1. 28
      conan.conf
  2. 5
      global.conf
  3. 1
      profiles/cura_build.jinja

28
conan.conf

@ -1,28 +0,0 @@
[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 = True # environment CONAN_PRINT_RUN_COMMANDS
[general]
scm_to_conandata = True
revisions_enabled = True
[conf]
[storage]
[proxies]
[hooks]
attribute_checker
[core]
default_build_profile = cura_build.jinja
default_profile = cura_release.jinja
required_conan_version = >=1.48
[tools]
env.virtual:auto_use = True
cmake.cmaketoolchain:generator = Ninja
gnu:define_libcxx11_abi = True

5
global.conf

@ -0,0 +1,5 @@
core:default_profile = cura.jinja
core:default_build_profile = cura_build.jinja
tools.cmake.cmaketoolchain:generator = Ninja
tools.env.virtualenv:auto_use = True
tools.gnu:define_libcxx11_abi = True

1
profiles/cura_build.jinja

@ -15,6 +15,5 @@ compiler.cppstd=17
[env]
[conf]
tools.cmake.cmaketoolchain:find_package_prefer_config=True
{% if platform.system() == 'Windows' %}tools.env.virtualenv:powershell=True{% endif %}
{% if compiler == 'Visual Studio' %}tools.microsoft.msbuild:vs_version=compiler.version{% endif %}

Loading…
Cancel
Save