From ccc49c16bc457878f7d750f6fa8d7d0f102e7a9d Mon Sep 17 00:00:00 2001 From: Thomas Devoogdt Date: Tue, 8 Aug 2023 09:02:45 +0200 Subject: [PATCH] package/qt6/qt6svg: use the CMAKE_NINJA flag Use the newly introduce backend option (4cf79d9b71ff5cf2aede3f21e09ade7c7ac59606) to specify what cmake backend to use, instead of special-coding it's use. Signed-off-by: Thomas Devoogdt Signed-off-by: Thomas Petazzoni --- package/qt6/qt6svg/qt6svg.mk | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/package/qt6/qt6svg/qt6svg.mk b/package/qt6/qt6svg/qt6svg.mk index be0addbd0d..25e87dd208 100644 --- a/package/qt6/qt6svg/qt6svg.mk +++ b/package/qt6/qt6svg/qt6svg.mk @@ -10,6 +10,8 @@ QT6SVG_SOURCE = qtsvg-$(QT6_SOURCE_TARBALL_PREFIX)-$(QT6SVG_VERSION).tar.xz QT6SVG_INSTALL_STAGING = YES QT6SVG_SUPPORTS_IN_SOURCE_BUILD = NO +QT6SVG_CMAKE_BACKEND = ninja + QT6SVG_LICENSE = \ GPL-2.0+ or LGPL-3.0, \ GPL-3.0 with exception (tools), \ @@ -25,7 +27,6 @@ QT6SVG_LICENSE_FILES = \ LICENSES/Qt-GPL-exception-1.0.txt QT6SVG_CONF_OPTS = \ - -GNinja \ -DQT_HOST_PATH=$(HOST_DIR) \ -DBUILD_WITH_PCH=OFF \ -DQT_BUILD_EXAMPLES=OFF \ @@ -33,19 +34,6 @@ QT6SVG_CONF_OPTS = \ QT6SVG_DEPENDENCIES = \ host-pkgconf \ - host-ninja \ qt6base -define QT6SVG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(BR2_CMAKE) --build $(QT6SVG_BUILDDIR) -endef - -define QT6SVG_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(STAGING_DIR) $(BR2_CMAKE) --install $(QT6SVG_BUILDDIR) -endef - -define QT6SVG_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) DESTDIR=$(TARGET_DIR) $(BR2_CMAKE) --install $(QT6SVG_BUILDDIR) -endef - $(eval $(cmake-package))