Trying to fix the cmake-qt problems, fixing cmake's FindQt4. Paraview now builds beyond 25%, while

before it didn't. Through this commit I expect the build farm to try to build kde, and see
whether this way it builds without the unusual NIX_CFLAGS_COMPILE set in the qt setup-hook.

svn path=/nixpkgs/trunk/; revision=15838
This commit is contained in:
Lluís Batlle i Rossell
2009-06-03 09:19:19 +00:00
parent 107d41f96c
commit 94d2e57c62
5 changed files with 57 additions and 3 deletions

View File

@@ -1,9 +1,8 @@
export QTDIR=@out@
if [ -z "$normalQt" ]; then
if [ -n "$includeAllQtDirs" ]; then
# This helps for g++, but not for moc. And no qt4 package should expect
# having all qt4 header files dirs into -I. But the KDE nix expressions want
# this.
# having all qt4 header files dirs into -I.
for d in @out@/include/*; do
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$d"
done