[Cmake-commits] [cmake-commits] alex committed FindQt4.cmake 1.177 1.178

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Nov 12 12:55:26 EST 2009


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

Modified Files:
	FindQt4.cmake 
Log Message:
also search for "qmake-mac", which is installed by macports (http://lists.kde.org/?l=kde-core-devel&m=125797773120427&w=2)

Alex


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.177
retrieving revision 1.178
diff -C 2 -d -r1.177 -r1.178
*** FindQt4.cmake	10 Nov 2009 18:57:21 -0000	1.177
--- FindQt4.cmake	12 Nov 2009 17:55:19 -0000	1.178
***************
*** 368,372 ****
  GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
  # check for qmake
! FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
--- 368,374 ----
  GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
  # check for qmake
! # Debian uses qmake-qt4
! # macports' Qt uses qmake-mac
! FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
    "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"



More information about the Cmake-commits mailing list