[Cmake-commits] [cmake-commits] king committed FindQt3.cmake 1.21 1.22

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt3.cmake 
Log Message:
FindQt3: Prefer (moc|uic)-qt3 names over (moc|uic)

On Debian moc and uic from Qt3 have '-qt3' suffixes.  The latter names
might come from Qt4, so prefer the version-specific names.

Patch from Modestas Vainius.  See issue #9659.


Index: FindQt3.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt3.cmake,v
retrieving revision 1.21
retrieving revision 1.22
diff -C 2 -d -r1.21 -r1.22
*** FindQt3.cmake	28 Sep 2009 15:45:40 -0000	1.21
--- FindQt3.cmake	5 Oct 2009 14:25:36 -0000	1.22
***************
*** 139,143 ****
  # qt 3 should prefer QTDIR over the PATH
  FIND_PROGRAM(QT_MOC_EXECUTABLE
!   NAMES moc moc-qt3
    HINTS
    $ENV{QTDIR}/bin
--- 139,143 ----
  # qt 3 should prefer QTDIR over the PATH
  FIND_PROGRAM(QT_MOC_EXECUTABLE
!   NAMES moc-qt3 moc
    HINTS
    $ENV{QTDIR}/bin
***************
*** 161,165 ****
  
  # qt 3 should prefer QTDIR over the PATH
! FIND_PROGRAM(QT_UIC_EXECUTABLE uic
    HINTS
    $ENV{QTDIR}/bin
--- 161,166 ----
  
  # qt 3 should prefer QTDIR over the PATH
! FIND_PROGRAM(QT_UIC_EXECUTABLE
!   NAMES uic-qt3 uic
    HINTS
    $ENV{QTDIR}/bin