Update conanfile.py

conan-io · Oct 5, 2023 · 75617e3 · 75617e3
1 parent fb48afe
commit 75617e3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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()