From b60e3d7693dec471728e41cebc328f641469afa3 Mon Sep 17 00:00:00 2001 From: Siim Meerits Date: Wed, 12 Jan 2022 10:36:57 +0200 Subject: [PATCH] (#8632) cpython: Add PATH variable only if env_vars option is enabled. Also add small info string fix to PYTHONHOME. --- recipes/cpython/all/conanfile.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/recipes/cpython/all/conanfile.py b/recipes/cpython/all/conanfile.py index a19e6b333e8c8..4fa1d1da6334e 100644 --- a/recipes/cpython/all/conanfile.py +++ b/recipes/cpython/all/conanfile.py @@ -700,9 +700,10 @@ def package_info(self): self.cpp_info.components["_hidden"].requires.append("tk::tk") self.cpp_info.components["_hidden"].libdirs = [] - bindir = os.path.join(self.package_folder, "bin") - self.output.info("Appending PATH environment variable: {}".format(bindir)) - self.env_info.PATH.append(bindir) + if self.options.env_vars: + bindir = os.path.join(self.package_folder, "bin") + self.output.info("Appending PATH environment variable: {}".format(bindir)) + self.env_info.PATH.append(bindir) python = self._cpython_interpreter_path self.user_info.python = python @@ -724,7 +725,7 @@ def package_info(self): if self.settings.compiler == "Visual Studio": if self.options.env_vars: - self.output.info("Setting PYTHON environment variable: {}".format(pythonhome)) + self.output.info("Setting PYTHONHOME environment variable: {}".format(pythonhome)) self.env_info.PYTHONHOME = pythonhome if self._is_py2: