diff --git a/README.md b/README.md new file mode 100644 index 0000000..bcde285 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# Ultimaker Conan configuration files + +> Conan is preparing a major update to 2.0, to ensure future proofing our recipes make sure you set the `CONAN_V2_MODE=1` +> environment variable. +> https://docs.conan.io/en/latest/reference/conan_v2_mode.html diff --git a/conan.conf b/conan.conf index 303a058..817eb51 100644 --- a/conan.conf +++ b/conan.conf @@ -1,20 +1,21 @@ [log] -run_to_output = True -run_to_file = True -level = warning -print_run_commands = True +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] +default_profile = cura_release.jinja +default_build_profile = cura_build.jinja compression_level = 9 sysrequires_sudo = True request_timeout = 60 -default_package_id_mode = full_version_mode -revisions_enabled = 1 -scm_to_conandata = 1 -full_transitive_package_id = 0 -default_profile = cura_release.jinja -default_build_profile = cura_build.jinja -required_conan_version = >=1.44.1 +default_package_id_mode = full_recipe_mode +full_transitive_package_id = True +revisions_enabled = True +scm_to_conandata = True +keep_python_files = False +required_conan_version = >=1.46.2 [storage] diff --git a/profiles/cura.jinja b/profiles/cura.jinja index 651c818..1b2a157 100644 --- a/profiles/cura.jinja +++ b/profiles/cura.jinja @@ -5,7 +5,7 @@ include(default) [settings] os={{ {"Darwin": "Macos"}.get(platform.system(), platform.system()) }} os_build={{ {"Darwin": "Macos"}.get(platform.system(), platform.system()) }} -compiler.cppstd=17 +compiler.cppstd=20 {% if compiler == "gcc" %} compiler.libcxx=libstdc++11 {% elif compiler == "apple-clang" %}