Skip to content

Commit

Permalink
bsd.qt.mk: Move QT_NONSTANDARD check to the _POSTMKINCLUDED section.
Browse files Browse the repository at this point in the history
Do it so that files in Mk/Uses can set it too. It is required by the
upcoming Uses/pyqt.mk that we will land soon to support PyQt5.

PR:		204975
  • Loading branch information
rakuco committed Dec 5, 2015
1 parent f0f7314 commit 7a38e43
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions Mk/bsd.qt.mk
Original file line number Diff line number Diff line change
Expand Up @@ -208,16 +208,6 @@ PLIST_SUB+= SHORTVER=${_QT_VERSION:R} \
FULLVER=${_QT_VERSION:C/-.*//}
.endif # defined(QT_DIST)

.if !defined(QT_NONSTANDARD)
CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
QMAKESPEC="${QMAKESPEC}"
CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
--with-qt-libraries=${QT_LIBDIR} \
--with-extra-includes=${LOCALBASE}/include \
--with-extra-libs=${LOCALBASE}/lib
.endif # !defined(QT_NONSTANDARD)

.if ${_QT_VERSION:M4*}
QT_BINDIR_REL?= bin
QT_LIBDIR_REL?= lib/${_QT_RELNAME}
Expand Down Expand Up @@ -287,6 +277,16 @@ PLIST_SUB+= QT_${dir}DIR="${QT_${dir}DIR_REL}"

Qt_Post_Include= bsd.qt.mk

.if !defined(QT_NONSTANDARD)
CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}" \
MOC="${MOC}" RCC="${RCC}" UIC="${UIC}" \
QMAKESPEC="${QMAKESPEC}"
CONFIGURE_ARGS+=--with-qt-includes=${QT_INCDIR} \
--with-qt-libraries=${QT_LIBDIR} \
--with-extra-includes=${LOCALBASE}/include \
--with-extra-libs=${LOCALBASE}/lib
.endif # !defined(QT_NONSTANDARD)

_USE_QT_ALL= assistant clucene dbus declarative designer gui help \
imageformats linguist linguisttools multimedia network opengl pixeltool \
qdbusviewer qmake script scripttools sql sql-ibase sql-mysql \
Expand Down

0 comments on commit 7a38e43

Please sign in to comment.