Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sets/exports.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
"ABMK",
"DUNE_INSTALL_AFTER",
"DUNE_PACKAGES",
"DUNE_BUILD_AFTER"
"DUNE_BUILD_AFTER",
"QMAKEVER"
],
"python": ["ABPY2VER", "ABPY2SHORTVER", "ABPY3VER", "ABPY3SHORTVER"]
}
10 changes: 9 additions & 1 deletion templates/20-qtproj.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,18 @@ build_qtproj_configure() {
else
abdie "Unknown qmake version: ${QMAKEVER}."
fi

export QTPROJ_SPEC
if bool "$USECLANG"; then
QTPROJ_SPEC=" -spec linux-clang "
else
QTPROJ_SPEC=" -spec linux-g++ "
fi

ab_tostringarray QTPROJ_AFTER
ab_typecheck -a QTPROJ_DEF
abinfo "Running ${QMAKE} to generate Makefile ..."
"/usr/bin/${QMAKE}" "${QTPROJ_DEF[@]}" "${QTPROJ_AFTER[@]}" \
"/usr/bin/${QMAKE}" $QTPROJ_SPEC "${QTPROJ_DEF[@]}" "${QTPROJ_AFTER[@]}" \
|| abdie "Failed while running qmake to generate Makefile: $?."
}

Expand Down
Loading