[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.150 1.151

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Feb 13 18:52:04 EST 2009


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

Modified Files:
	FindQt4.cmake 
Log Message:

ENH:  Allowing finding a relocated Qt installation which contains a qt.conf to override the hardcoded paths in qmake.
      Fixes #8532.



Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.150
retrieving revision 1.151
diff -C 2 -d -r1.150 -r1.151
*** FindQt4.cmake	10 Feb 2009 23:13:24 -0000	1.150
--- FindQt4.cmake	13 Feb 2009 23:52:02 -0000	1.151
***************
*** 799,826 ****
  
  
-   # 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)
--- 799,805 ----
  
  
    IF(QT_QMAKE_CHANGED)
+     SET(QT_UIC_EXECUTABLE NOTFOUND)
+     SET(QT_MOC_EXECUTABLE NOTFOUND)
      SET(QT_UIC3_EXECUTABLE NOTFOUND)
      SET(QT_RCC_EXECUTABLE NOTFOUND)
***************
*** 830,833 ****
--- 809,824 ----
      SET(QT_LRELEASE_EXECUTABLE NOTFOUND)
    ENDIF(QT_QMAKE_CHANGED)
+   
+   FIND_PROGRAM(QT_MOC_EXECUTABLE
+     NAMES moc-qt4 moc
+     PATHS ${QT_BINARY_DIR}
+     NO_DEFAULT_PATH
+     )
+ 
+   FIND_PROGRAM(QT_UIC_EXECUTABLE
+     NAMES uic-qt4 uic
+     PATHS ${QT_BINARY_DIR}
+     NO_DEFAULT_PATH
+     )
  
    FIND_PROGRAM(QT_UIC3_EXECUTABLE



More information about the Cmake-commits mailing list