From bb9f205f151707f3eb86021b74c8e37a655b6e4c Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Wed, 17 Aug 2022 14:30:17 +0300 Subject: Conan: Implement 'package_env_info()' in the build recipe The qtwebengine needs to pass information about where the QtWebEngineProcess is located for Conan as each Qt package is installed under separate install prefix inside the Conan cache. Locate the QtWebEngineProcess from the installation folder under the qtwebengine install prefix inside the Conan cache. Return a dictionary where 'QTWEBENGINEPROCESS_PATH' points to the located QtWebEngineProcess file. Change-Id: I54da22eae3b0e7cca0b1a19e683f661ccf21d219 Reviewed-by: Toni Saario (cherry picked from commit 99a792bdb963b9b425db0f15db3832c50cd937c7) Reviewed-by: Qt Cherry-pick Bot --- conanfile.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/conanfile.py b/conanfile.py index a1547a7b9..137285c08 100644 --- a/conanfile.py +++ b/conanfile.py @@ -70,3 +70,20 @@ class QtWebEngine(ConanFile): def get_qt_leaf_module_default_options(self) -> Dict[str, Any]: """Implements abstractmethod from qt-conan-common.QtLeafModule""" return self._shared.convert_qt_features_to_default_conan_options(_qtwebengine_features) + + def package_env_info(self) -> Dict[str, Any]: + """Implements abstractmethod from qt-conan-common.QtLeafModule""" + # this will be called only after a successful build + _f = lambda p: True + if tools.os_info.is_windows: + ptrn = "**/QtWebEngineProcess.exe" + elif tools.os_info.is_macos: + ptrn = "**/QtWebEngineProcess.app/**/QtWebEngineProcess" + _f = lambda p: not any(".dSYM" in item for item in p.parts) + else: + ptrn = "**/QtWebEngineProcess" + ret = [str(p) for p in Path(self.package_folder).rglob(ptrn) if p.is_file() and _f(p)] + if len(ret) != 1: + print("Expected to find one 'QtWebEngineProcess'. Found: {0}".format(ret)) + return {"QTWEBENGINEPROCESS_PATH": ret.pop() if ret else ""} + -- cgit v1.2.3