GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build,qt: Simplify check for moc

Browse Source 
m4/qt6.m4: Remove alternative checks for moc that were taken over from
Qt 5 and that are obsolete for Qt 6.
--
This commit is contained in:
Ingo Klöcker 2023-04-19 09:23:05 +02:00
parent e80bf34bf8
commit a14155d2c1
No known key found for this signature in database
GPG Key ID: F5A5D1692277A1E9
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
m4/qt6.m4
View File

@ -27,31 +27,10 @@ AC_DEFUN([FIND_QT6],
# Qt6 moved moc to libexec # Qt6 moved moc to libexec
qt6libexecdir=$($PKG_CONFIG --variable=libexecdir 'Qt6Core >= 6.4.0') qt6libexecdir=$($PKG_CONFIG --variable=libexecdir 'Qt6Core >= 6.4.0')
AC_PATH_TOOL(MOC, moc, [], [$qt6libexecdir]) AC_PATH_TOOL(MOC, moc, [], [$qt6libexecdir])
AC_MSG_CHECKING([moc version]) if test -z "$MOC"; then
mocversion=`$MOC -v 2>&1` AC_MSG_WARN([moc not found - Qt 6 binding will not be built.])
mocversiongrep=`echo $mocversion | grep -E "Qt 6|moc 6"`
if test x"$mocversiongrep" != x"$mocversion"; then
AC_MSG_RESULT([no])
# moc was not the qt6 one, try with moc-qt6
AC_CHECK_TOOL(MOC2, moc-qt6)
mocversion=`$MOC2 -v 2>&1`
mocversiongrep=`echo $mocversion | grep -E "Qt 6|moc-qt6 6|moc 6"`
if test x"$mocversiongrep" != x"$mocversion"; then
AC_CHECK_TOOL(QTCHOOSER, qtchooser)
qt6tooldir=`QT_SELECT=qt6 qtchooser -print-env | grep QTTOOLDIR | cut -d '=' -f 2 | cut -d \" -f 2`
mocversion=`$qt6tooldir/moc -v 2>&1`
mocversiongrep=`echo $mocversion | grep -E "Qt 6|moc 6"`
if test x"$mocversiongrep" != x"$mocversion"; then
# no valid moc found
have_qt6_libs="no"; have_qt6_libs="no";
else
MOC=$qt6tooldir/moc
fi fi
else
MOC=$MOC2
fi
fi
AC_MSG_RESULT([$mocversion])
fi fi
if test "$have_qt6_libs" = "yes"; then if test "$have_qt6_libs" = "yes"; then
dnl Check that a binary can actually be build with this qt. dnl Check that a binary can actually be build with this qt.