[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.141 1.142

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:

BUG:  Revert 1.138.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.141
retrieving revision 1.142
diff -C 2 -d -r1.141 -r1.142
*** FindQt4.cmake	5 Nov 2008 22:56:55 -0000	1.141
--- FindQt4.cmake	25 Nov 2008 21:56:44 -0000	1.142
***************
*** 753,759 ****
  
  
    IF(QT_QMAKE_CHANGED)
-     SET(QT_MOC_EXECUTABLE NOTFOUND)
-     SET(QT_UIC_EXECUTABLE NOTFOUND)
      SET(QT_UIC3_EXECUTABLE NOTFOUND)
      SET(QT_RCC_EXECUTABLE NOTFOUND)
--- 753,780 ----
  
  
+   # find moc and uic using qmake
+   QT_QUERY_QMAKE(QT_MOC_EXECUTABLE_INTERNAL "QMAKE_MOC")
+   QT_QUERY_QMAKE(QT_UIC_EXECUTABLE_INTERNAL "QMAKE_UIC")
+ 
+   # make sure we have / and not \ as qmake gives on windows
+   FILE(TO_CMAKE_PATH 
+     "${QT_MOC_EXECUTABLE_INTERNAL}" QT_MOC_EXECUTABLE_INTERNAL)
+   # make sure we have / and not \ as qmake gives on windows
+   FILE(TO_CMAKE_PATH 
+     "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL)
+ 
+   IF(QT_QMAKE_CHANGED)
+     SET(QT_MOC_EXECUTABLE 
+       ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable" FORCE)
+     SET(QT_UIC_EXECUTABLE 
+       ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE)
+   ELSE(QT_QMAKE_CHANGED)
+     SET(QT_MOC_EXECUTABLE 
+       ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The moc executable")
+     SET(QT_UIC_EXECUTABLE 
+       ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable")
+   ENDIF(QT_QMAKE_CHANGED)
+ 
    IF(QT_QMAKE_CHANGED)
      SET(QT_UIC3_EXECUTABLE NOTFOUND)
      SET(QT_RCC_EXECUTABLE NOTFOUND)
***************
*** 763,778 ****
      SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
    ENDIF(QT_QMAKE_CHANGED)
-   
-   FIND_PROGRAM(QT_MOC_EXECUTABLE
-     NAMES moc
-     PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
-     )
-   
-   FIND_PROGRAM(QT_UIC_EXECUTABLE
-     NAMES uic
-     PATHS ${QT_BINARY_DIR}
-     NO_DEFAULT_PATH
-     )
  
    FIND_PROGRAM(QT_UIC3_EXECUTABLE
--- 784,787 ----