Skip to content

Commit 7700676

Browse files
committed
hyperhdr: find Qt5 cmake configs in staging area and addon (2)
Same fix as hyperion: generate a thin cmake toolchain wrapper that includes the real LE toolchain and appends Qt5's staging prefix to CMAKE_FIND_ROOT_PATH so cmake can locate Qt5's config files.
1 parent baad20a commit 7700676

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

packages/addons/service/hyperhdr/package.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
PKG_NAME="hyperhdr"
55
PKG_VERSION="21.0.0.0"
66
PKG_SHA256="fde381b8ae701c93b57b23cfa95c56dcbbecee7e5e7b2cce5d8b5f97ed86a676"
7-
PKG_REV="1"
7+
PKG_REV="2"
88
PKG_LICENSE="MIT"
99
PKG_SITE="https://github.com/awawa-dev/HyperHDR"
1010
PKG_URL="https://github.com/awawa-dev/HyperHDR/archive/v${PKG_VERSION}.tar.gz"
@@ -49,6 +49,11 @@ PKG_CMAKE_OPTS_TARGET="-DCMAKE_NO_SYSTEM_FROM_IMPORTED=ON \
4949
-Wno-dev"
5050

5151
pre_configure_target() {
52+
cat > "${PKG_BUILD}/toolchain-qt5.cmake" <<EOF
53+
include("${CMAKE_CONF}")
54+
list(APPEND CMAKE_FIND_ROOT_PATH "$(get_install_dir qt5)/usr")
55+
EOF
56+
PKG_CMAKE_OPTS_TARGET+=" -DCMAKE_TOOLCHAIN_FILE=${PKG_BUILD}/toolchain-qt5.cmake"
5257
pkg_flatbuffers_version=$(get_pkg_version flatbuffers)
5358
tar --strip-components=1 -xf "${SOURCES}/flatbuffers/flatbuffers-${pkg_flatbuffers_version}.tar.gz" -C "${PKG_BUILD}/external/flatbuffers"
5459
cp -a $(get_build_dir rpi_ws281x)/* ${PKG_BUILD}/external/rpi_ws281x

0 commit comments

Comments
 (0)