diff options
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | lib/Debian/Debhelper/Buildsystem/cmake.pm | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 36418f60..2beda1fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,11 @@ debhelper (11.5.2) UNRELEASED; urgency=medium Thanks to Laurent Bigonville for reporting the issue. (Closes: #912978) + [ Helmut Grohne ] + * cmake.pm: Pass QMAKE_EXECUTABLE when cross-building. + (Closes: #913415) + + -- Niels Thykier <niels@thykier.net> Sat, 03 Nov 2018 08:02:02 +0000 debhelper (11.5.1) unstable; urgency=medium diff --git a/lib/Debian/Debhelper/Buildsystem/cmake.pm b/lib/Debian/Debhelper/Buildsystem/cmake.pm index b2364a59..37f82c6c 100644 --- a/lib/Debian/Debhelper/Buildsystem/cmake.pm +++ b/lib/Debian/Debhelper/Buildsystem/cmake.pm @@ -110,6 +110,7 @@ sub configure { } push(@flags, "-DPKG_CONFIG_EXECUTABLE=/usr/bin/" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config"); push(@flags, "-DPKGCONFIG_EXECUTABLE=/usr/bin/" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-pkg-config"); + push(@flags, "-DQMAKE_EXECUTABLE=/usr/bin/" . dpkg_architecture_value("DEB_HOST_GNU_TYPE") . "-qmake"); } push(@flags, "-DCMAKE_INSTALL_LIBDIR=lib/" . dpkg_architecture_value("DEB_HOST_MULTIARCH")); |