From 75617e320416efce4abd429637780d347bcf7245 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Thu, 5 Oct 2023 08:45:44 +0200 Subject: [PATCH] Update conanfile.py --- recipes/qt/6.x.x/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/qt/6.x.x/conanfile.py b/recipes/qt/6.x.x/conanfile.py index 8272408f5c892..dea11354f0c86 100644 --- a/recipes/qt/6.x.x/conanfile.py +++ b/recipes/qt/6.x.x/conanfile.py @@ -418,6 +418,7 @@ def generate(self): vre.generate(scope="build") # TODO: to remove when properly handled by conan (see https://github.com/conan-io/conan/issues/11962) env = Environment() + env.unset("VCPKG_ROOT") env.prepend_path("PKG_CONFIG_PATH", self.generators_folder) env.vars(self).save_script("conanbuildenv_pkg_config_path") if self._settings_build.os == "Macos": @@ -575,8 +576,7 @@ def generate(self): if Version(self.version) >= "6.5.0": cpp_std_map["23"] = "FEATURE_cxx2b" - tc.variables[cpp_std_map.get(current_cpp_std, "FEATURE_cxx17")] = "ON" - tc.cache_variables["QT_USE_VCPKG"] = False + tc.variables[cpp_std_map.get(current_cpp_std, "FEATURE_cxx17")] = "ON" tc.generate()