scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 23:40:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: Preffer QT5 qmake instead of qtselector one (+ use QtGui for dependencies)

Browse Source
This commit is contained in:
Lukas Rucka
2018-06-05 13:36:35 +02:00
parent 35348b8166
commit 952de50449
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
configure.ac
View File

@@ -2366,17 +2366,21 @@ PKG_CHECK_MODULES(QT, [qt_gui_dep], [FOUND_QT_DEP=yes], [FOUND_QT_DEP=no])
if test $qt_req != no -a $FOUND_QT_DEP = yes
then
# Retrieve Qt compilation and linker flags
CXXFLAGS="`$PKG_CONFIG --cflags-only-I QtCore ` $CXXFLAGS"
CFLAGS="`$PKG_CONFIG --cflags-only-I QtCore ` $CFLAGS"
LDFLAGS="`$PKG_CONFIG --libs-only-L QtCore ` $LDFLAGS"
LIBS="`$PKG_CONFIG --libs-only-l QtCore ` $LIBS"
CXXFLAGS="`$PKG_CONFIG --cflags-only-I Qt5Gui ` $CXXFLAGS"
CFLAGS="`$PKG_CONFIG --cflags-only-I Qt5Gui ` $CFLAGS"
LDFLAGS="`$PKG_CONFIG --libs-only-L Qt5Gui ` $LDFLAGS"
LIBS="`$PKG_CONFIG --libs-only-l Qt5Gui ` $LIBS"
ADD_MODULE("display_preview", "src/video_display/preview.o", "$PREVIEW_DISP_LIBS")
AC_CHECK_PROGS(QMAKE, [qmake-qt5 qmake])
AC_PATH_PROGS(QMAKE, [qmake-qt5 qmake], [:], [/usr/lib/qt5/bin:$PATH])
GUI_TARGET=gui/QT/uv-qt
qt_gui=yes
if test ":" = "$QMAKE"; then
qt_gui=no
else
qt_gui=yes
fi
fi
AC_SUBST(GUI_TARGET)