AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conan: Do not force 'qt_host_path' usage in cross-build context

Browse Source 
If the user does not pass:

  -o qtbase:qt_host_path=/foo

then log a warning but allow to continue. For example Boot2Qt
integration resolves the 'QT_HOST_PATH' by other means thus making it
a mandatory option to be passed by the user should not be needed.

Pick-to: 6.3 6.4
Change-Id: I4c1d8b5253e33466ccdf463f89473966e90c0e0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
This commit is contained in:
Iikka Eklund 2022-06-21 12:13:34 +03:00
parent 2c0518eb62
commit 5271f5082c
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
conanfile.py
View File

@ -8,7 +8,7 @@ import re
import shutil import shutil
from functools import lru_cache from functools import lru_cache
from pathlib import Path from pathlib import Path
from typing import Dict from typing import Dict, Union
class QtConanError(Exception): class QtConanError(Exception):
@ -128,13 +128,22 @@ class QtBase(ConanFile):
print("Setting 3rd party package requirement: {0}".format(requirement)) print("Setting 3rd party package requirement: {0}".format(requirement))
self.requires(requirement) self.requires(requirement)
def _resolve_qt_host_path(self) -> str: def _resolve_qt_host_path(self) -> Union[str, None]:
# When cross-building the user needs to pass 'qt_host_path' which is transformed to """
# QT_HOST_PATH later on. Resolve the exact path. Attempt to resolve QT_HOST_PATH.
qt_host_path = self.options.get_safe("qt_host_path")
if not qt_host_path: When cross-building the user needs to pass 'qt_host_path' which is transformed to
raise QtConanError("Expected 'qt_host_path' option in cross-build context") QT_HOST_PATH later on. Resolve the exact path if possible.
return str(Path(os.path.expandvars(str(qt_host_path))).expanduser().resolve(strict=True))
Returns:
string: The resolved QT_HOST_PATH or None if unable to determine it.
"""
_host_p = self.options.get_safe("qt_host_path")
if _host_p:
return str(Path(os.path.expandvars(str(_host_p))).expanduser().resolve(strict=True))
else:
print("Warning: 'qt_host_path' option was not given in cross-build context")
return None
def configure(self): def configure(self):
if self.settings.compiler == "gcc" and tools.Version(self.settings.compiler.version) < "8": if self.settings.compiler == "gcc" and tools.Version(self.settings.compiler.version) < "8":
@ -249,7 +258,9 @@ class QtBase(ConanFile):
def package_info(self): def package_info(self):
self._shared.package_info(self) self._shared.package_info(self)
if tools.cross_building(conanfile=self): if tools.cross_building(conanfile=self):
self.env_info.QT_HOST_PATH.append(self._resolve_qt_host_path()) qt_host_path = self._resolve_qt_host_path()
if qt_host_path:
self.env_info.QT_HOST_PATH.append(qt_host_path)
def package_id(self): def package_id(self):
# https://docs.conan.io/en/latest/creating_packages/define_abi_compatibility.html # https://docs.conan.io/en/latest/creating_packages/define_abi_compatibility.html