Permalink
Browse files

Add --qmakespecs option to configure

Allows to specificy an alternative qmake specs file
e.g.:
--qmakespecs=~/QtSDK/Desktop/Qt/4.8.1/gcc/mkspecs/macx-llvm
  • Loading branch information...
jyavenard committed Dec 17, 2012
1 parent e2a380f commit cbe419a6fe58e2fd0a1425b61def5a1a811956ba
Showing with 15 additions and 6 deletions.
  1. +15 −6 mythtv/configure
View
@@ -79,6 +79,7 @@ Advanced options (experts only):
--cxx=CXX use C++ compiler CXX [$cxx_default]
--ld=LD use linker LD
--qmake=QMAKE use specified qmake [$qmake_default]
--qmakespecs=PATH use specified mkspecs
--extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]
--extra-cxxflags=ECXFLAGS add ECXXFLAGS to list of flags for C++ compile
--extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS]
@@ -1785,6 +1786,7 @@ MYTHTV_CMDLINE_SET='
logging
python
qmake
qmakespecs
samples
source_path
'
@@ -2402,6 +2404,7 @@ nogas=":"
ccache="yes"
distcc="yes"
qmake_default="qmake"
qmakespecs_default=""
python_default="python"
# machine
@@ -2909,7 +2912,7 @@ if ! $pkg_config --version >/dev/null 2>&1; then
pkg_config=false
fi
set_default qmake python yasmexe
set_default qmake qmakespecs python yasmexe
exesuf() {
case $1 in
@@ -4208,6 +4211,12 @@ is_qmake4(){
$1 --version 2>&1 | egrep -q -e "Qt version 4\.[8-9]\.[0-9]"
}
if test x"$qmakespecs" != x; then
qmakeconf="$qmake -spec $qmakespecs"
else
qmakeconf="$qmake"
fi
if ! is_qmake5 $qmake ; then
if ! is_qmake4 $qmake; then
is_qmake4 qmake-qt4 && qmake=qmake-qt4 || die "qmake for Qt4.8 or newer not found.\nPlease specify the correct qmake with --qmake="
@@ -5786,7 +5795,7 @@ ARCH=$arch
CC=$cc
CXX=$cxx
AS=$as
QMAKE=$qmake
QMAKE=$qmakeconf
QMAKE_CC=$cc
QMAKE_CXX=$cxx
QMAKE_LINK=$cxx
@@ -6211,15 +6220,15 @@ echo "Configuring zeromq..."
--includedir=${prefix}/include/mythtv/zeromq)
echo "Configuring nzmqt..."
(cd external/nzmqt/src ; \
${qmake} -o Makefile)
${qmakeconf} -o Makefile)
echo "Configuring qjson..."
(cd external/qjson ; \
${qmake} -o Makefile)
${qmakeconf} -o Makefile)
if ! disabled hdhomerun ; then
echo "Configuring libhdhomerun..."
(cd external/libhdhomerun; \
${qmake} -o Makefile.lib CONFIG+=Makefile.lib; \
${qmake} -o Makefile.app CONFIG+=Makefile.app)
${qmakeconf} -o Makefile.lib CONFIG+=Makefile.lib; \
${qmakeconf} -o Makefile.app CONFIG+=Makefile.app)
fi
test -n "$WARNINGS" && printf "\n$WARNINGS" || exit 0

0 comments on commit cbe419a

Please sign in to comment.