From 7f32e902c8a6fa88adb4c943604be4de6daf38b9 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Fri, 29 Jan 2021 12:23:34 +0200 Subject: [PATCH] conanfile.py: Use QTDIR instead of QT_PATH There's an established environment variable for this though, QTDIR. This environment variable is also set by Qt Creator by default. So the Conan recipes should accept this environment variable instead. This requires a change in the matching conan profile files where the path to Qt installation is injected to env. Pick-to: 6.1 Task-number: QTBUG-90583 Change-Id: I33e2ebc6b04f87027e039d0ae951179f5b2d5530 Reviewed-by: Antti Kokko --- conanfile.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index 5ee8b07..29857b3 100644 --- a/conanfile.py +++ b/conanfile.py @@ -55,11 +55,11 @@ class QtCoAP(ConanFile): pass def _get_cmake_prefix_path(self): - # 'QT_PATH' provided as env variable in profile file which is part of the Qt essential binary + # 'QTDIR' provided as env variable in profile file which is part of the Qt essential binary # package(s). Installed under .conan/profiles - cmake_prefix_path = os.environ.get("QT_PATH") + cmake_prefix_path = os.environ.get("QTDIR") if not cmake_prefix_path: - raise QtConanError("'QT_PATH' not defined! The 'QT_PATH' needs to point to Qt installation directory.") + raise QtConanError("'QTDIR' not defined! The 'QTDIR' needs to point to Qt installation directory.") print(f"CMAKE_PREFIX_PATH for '{self.name}/{self.version}' build is: {cmake_prefix_path}") return cmake_prefix_path @@ -74,7 +74,7 @@ class QtCoAP(ConanFile): ext = ".bat" if tools.os_info.is_windows else "" qtcmake = os.path.abspath(os.path.join(qt_install_path, "bin", "qt-cmake" + ext)) if not os.path.exists(qtcmake): - raise QtConanError(f"Unable to locate {qtcmake} from 'QT_PATH': {qt_install_path}") + raise QtConanError(f"Unable to locate {qtcmake} from 'QTDIR': {qt_install_path}") return qtcmake def _get_cmake_tool(self):