[cmake-commits] hoffman committed FindQt3.cmake 1.14 1.15

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv15546/Modules

Modified Files:
	FindQt3.cmake 
Log Message:
ENH: make sure findqt3 finds qt3 and not qt4


Index: FindQt3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt3.cmake,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- FindQt3.cmake	30 Aug 2006 17:51:22 -0000	1.14
+++ FindQt3.cmake	22 Nov 2006 18:30:59 -0000	1.15
@@ -280,17 +280,33 @@
   ENDIF(QT_QT_LIBRARY MATCHES "qt-mt")
 ENDIF(QT_FOUND)
 
+EXEC_PROGRAM(${QT_MOC_EXECUTABLE} ARGS "-v" OUTPUT_VARIABLE QTVERSION_MOC)
+EXEC_PROGRAM(${QT_UIC_EXECUTABLE} ARGS "-version" OUTPUT_VARIABLE QTVERSION_UI)
+
+SET(_QT_UIC_VERSION_3 FALSE)
+IF("${QTVERSION_UIC}" MATCHES ".* 3..*")
+  SET(_QT_UIC_VERSION_3 TRUE)
+ENDIF("${QTVERSION_UIC}" MATCHES ".* 3..*")
+
+SET(_QT_MOC_VERSION_3 FALSE)
+IF("${QTVERSION_MOC}" MATCHES ".* 3..*")
+  SET(_QT_MOC_VERSION_3 TRUE)
+ENDIF("${QTVERSION_MOC}" MATCHES ".* 3..*")
 
+SET(QT_WRAP_CPP FALSE)
 IF (QT_MOC_EXECUTABLE)
-  SET ( QT_WRAP_CPP "YES")
+  IF(_QT_MOC_VERSION_3)
+    SET ( QT_WRAP_CPP TRUE)
+  ENDIF(_QT_MOC_VERSION_3)
 ENDIF (QT_MOC_EXECUTABLE)
 
+SET(QT_WRAP_UI FALSE)
 IF (QT_UIC_EXECUTABLE)
-  SET ( QT_WRAP_UI "YES")
+  IF(_QT_UIC_VERSION_3)
+    SET ( QT_WRAP_UI TRUE)
+  ENDIF(_QT_UIC_VERSION_3)
 ENDIF (QT_UIC_EXECUTABLE)
 
-
-
 MARK_AS_ADVANCED(
   QT_INCLUDE_DIR
   QT_QT_LIBRARY