[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-bindings
Subject:    [Kde-bindings] KDE/kdebindings/smoke/qt
From:       Caleb Tennis <caleb () gentoo ! org>
Date:       2007-03-03 15:28:57
Message-ID: 1172935737.339578.28419.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 638848 by ctennis:

On OS X Qt framework installs, QtCore/qglobal.h may not exist.  Instead,
use the QtCore header directory from cmake to find the qglobal.h file.

CCMAIL: kde-bindings@kde.org



 M  +4 -4      qtguess.pl.cmake  


--- trunk/KDE/kdebindings/smoke/qt/qtguess.pl.cmake #638847:638848
@@ -35,7 +35,7 @@
 my %qtundefs=();
 
 my $tmp = gettmpfile();
-my $qtinc = '@QT_INCLUDE_DIR@';
+my $qtcoreinc = '@QT_QTCORE_INCLUDE_DIR@';
 my $allinc = '@all_includes@';
 my $alllib = '-L@QT_LIBRARY_DIR@';
 my $qtflags = '@qtflags@';
@@ -52,7 +52,7 @@
 # 
 # $qtflags =~ s/\$\((.*?)\)/$x{$1}/g;
 
- -e "$qtinc/QtCore/qglobal.h" or die "Invalid Qt include directory.\n";
+ -e "$qtcoreinc/qglobal.h" or die "Invalid Qt include directory.\n";
 
 my $ccmd = "$cc $ccflags $allinc $alllib -o $tmp $tmp.cpp $qtflags";
 
@@ -94,7 +94,7 @@
 
 sub grab_qglobal_symbols
 {
-	my $cmd = "$cc -E -D__cplusplus -dM -I$qtinc/QtCore $qtinc/QtCore/qglobal.h 2>/dev/null";
+	my $cmd = "$cc -E -D__cplusplus -dM -I$qtcoreinc $qtcoreinc/qglobal.h 2>/dev/null";
 	my $symbols = `$cmd`;
         for(0..1)
         {
@@ -115,7 +115,7 @@
 	    elsif(! $_) # first try
 	    {
 		print  "Failed to run $cmd.\nTrying without __cplusplus (might be already defined)\n";
-                $cmd = "$cc -E -dM -I$qtinc/QtCore $qtinc/QtCore/qglobal.h 2>/dev/null";
+                $cmd = "$cc -E -dM -I$qtcoreinc $qtcoreinc/qglobal.h 2>/dev/null";
                 $symbols = `$cmd`;
                 next;
 	    }
_______________________________________________
Kde-bindings mailing list
Kde-bindings@kde.org
https://mail.kde.org/mailman/listinfo/kde-bindings
[prev in list] [next in list] [prev in thread] [next in thread]