From 636ee2e19ae160061b6c5f2cb629fc978e323bb5 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 17 Aug 2022 10:08:36 +0200 Subject: [PATCH 1/2] Always use short paths on Windows --- conan.conf | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/conan.conf b/conan.conf index 94d08c4..3fc8f16 100644 --- a/conan.conf +++ b/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 From e66a21a9391e66796e4fa16af691770be9008c30 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Wed, 17 Aug 2022 10:13:48 +0200 Subject: [PATCH 2/2] Don't specify os and os_build --- profiles/cura.jinja | 3 +-- profiles/cura_build.jinja | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/profiles/cura.jinja b/profiles/cura.jinja index 49cb87e..8f14c8d 100644 --- a/profiles/cura.jinja +++ b/profiles/cura.jinja @@ -3,9 +3,8 @@ 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 +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 diff --git a/profiles/cura_build.jinja b/profiles/cura_build.jinja index 49cb87e..c747fd0 100644 --- a/profiles/cura_build.jinja +++ b/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++