From 58bb0908389af1f0f95771dde3ea05cde04b80d8 Mon Sep 17 00:00:00 2001
From: "j.spijker@ultimaker.com" <jelle spijker>
Date: Sat, 18 Jun 2022 13:55:43 +0200
Subject: [PATCH] Use global.conf and remove conan.conf

Contributes to CURA-9365
---
 conan.conf                | 28 ----------------------------
 global.conf               |  5 +++++
 profiles/cura_build.jinja |  1 -
 3 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 conan.conf
 create mode 100644 global.conf

diff --git a/conan.conf b/conan.conf
deleted file mode 100644
index a75d2e4..0000000
--- a/conan.conf
+++ /dev/null
@@ -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
diff --git a/global.conf b/global.conf
new file mode 100644
index 0000000..0d8f6f7
--- /dev/null
+++ b/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
diff --git a/profiles/cura_build.jinja b/profiles/cura_build.jinja
index 0a1d9b5..f1369c7 100644
--- a/profiles/cura_build.jinja
+++ b/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 %}