diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2021-01-29 13:59:41 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-02-15 06:54:52 +0000 |
| commit | 32203587d5b8ef615c7cbc0fc77a637eea51048b (patch) | |
| tree | 848dd23b272f873343031cebb308def2dee690ca | |
| parent | 614eaf0d6147f8fd6db51ae1f7cb1621070d1e6e (diff) | |
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.
Task-number: QTBUG-90583
Change-Id: I128cc1390f0a8525ee4490393cb63338bf511c16
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 64dada44e1cd0f15da0cc12105aebe83210cbdfe)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | conanfile.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/conanfile.py b/conanfile.py index 3b66c2ea..41f040a6 100644 --- a/conanfile.py +++ b/conanfile.py @@ -54,11 +54,11 @@ class QtDataVisualization(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 @@ -73,7 +73,7 @@ class QtDataVisualization(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): |