Hello.

I'm new to the list and KDE4, but as a long time KDE user I just had to check 
out trunk :)
Sadly I've noticed two small errors which prevented kdelibs to build on my 
system (with distro Qt4 package - yes I know it won't built with it although 
it 4.2.2 but I just wanted to try :). CMake couldn't find qmake, because it's 
name is a little bit different from that in other distributions (I'm using 
PLD Linux Distribution) and also the qdbus*2* utils are localted elsewhere. 
The attached patch should fix it.

Thanks for the great work!
-- 
Łukasz [DeeJay1] Jernaś
IEA ACTUS
http://www.actus.org.pl/
Index: FindQt4.cmake
===================================================================
--- FindQt4.cmake	(wersja 620507)
+++ FindQt4.cmake	(kopia robocza)
@@ -202,7 +202,7 @@
 ENDMACRO(QT_QUERY_QMAKE)
 
 # check for qmake
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qt4-qmake PATHS
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
   $ENV{QTDIR}/bin
@@ -741,15 +741,19 @@
     NO_DEFAULT_PATH
     )
 
-  FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE 
+  FIND_PROGRAM(QT_DBUSCPP2XML_EXECUTABLE
     NAMES qdbuscpp2xml
-    PATHS ${QT_BINARY_DIR}
+    PATHS
+    ${QT_BINARY_DIR}
+    $ENV{QTDIR}/bin
     NO_DEFAULT_PATH
     )
 
-  FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE 
+  FIND_PROGRAM(QT_DBUSXML2CPP_EXECUTABLE
     NAMES qdbusxml2cpp
-    PATHS ${QT_BINARY_DIR}
+    PATHS
+    ${QT_BINARY_DIR}
+    $ENV{QTDIR}/bin
     NO_DEFAULT_PATH
     )
 

Attachment: pgpgCSyTnxfs0.pgp
Description: PGP signature

_______________________________________________
Kde-buildsystem mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-buildsystem

Reply via email to