Skip to content

Commit baad20a

Browse files
committed
hyperion: find Qt5 cmake configs in staging area and addon (2)
Qt5 is built with -sysroot removed and installs entirely under its own staging prefix rather than into the sysroot. The default cmake toolchain file sets CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY, so cmake cannot find Qt5's config files outside CMAKE_FIND_ROOT_PATH. Generate a thin wrapper toolchain file that includes the real LE toolchain and appends Qt5's staging prefix to CMAKE_FIND_ROOT_PATH. Pass this via PKG_CMAKE_OPTS_TARGET so it overrides the default toolchain file.
1 parent 9922eca commit baad20a

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

packages/addons/service/hyperion/package.mk

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PKG_NAME="hyperion"
55
PKG_VERSION="fb413cd7e8825ffc26925013f57ac93a774f12bc"
66
PKG_SHA256="fafa4eeddacb15a8fd96b0e69fac400faa735c6e1ccd78673c9d96b0ac84d7a3"
77
PKG_VERSION_DATE="2019-08-19"
8-
PKG_REV="1"
8+
PKG_REV="2"
99
PKG_ARCH="any"
1010
PKG_LICENSE="MIT"
1111
PKG_SITE="https://github.com/hyperion-project/hyperion"
@@ -53,6 +53,12 @@ pre_build_target() {
5353

5454
pre_configure_target() {
5555
echo "" >../cmake/FindGitVersion.cmake
56+
57+
cat > "${PKG_BUILD}/toolchain-qt5.cmake" <<EOF
58+
include("${CMAKE_CONF}")
59+
list(APPEND CMAKE_FIND_ROOT_PATH "$(get_install_dir qt5)/usr")
60+
EOF
61+
PKG_CMAKE_OPTS_TARGET+=" -DCMAKE_TOOLCHAIN_FILE=${PKG_BUILD}/toolchain-qt5.cmake"
5662
}
5763

5864
addon() {

0 commit comments

Comments
 (0)