diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2008-05-27 22:12:09 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2008-05-27 22:12:09 +0000 |
| commit | 18dd6954f3060c12b7882f4cb2a1f68dbfc0f102 (patch) | |
| tree | 51edb00936e1a3da263df313cad16c1fa2858d19 /devel/cmake/files/patch-Modules_FindQt4.cmake | |
| parent | - Update to 1.5.6 (diff) | |
- Add common code to support for cmake based ports.
- Update devel/cmake to 2.6.0 (also fix ports/123092)
- Use the new CMAKE build framework in all ports using cmake
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=213789
Diffstat (limited to 'devel/cmake/files/patch-Modules_FindQt4.cmake')
| -rw-r--r-- | devel/cmake/files/patch-Modules_FindQt4.cmake | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/devel/cmake/files/patch-Modules_FindQt4.cmake b/devel/cmake/files/patch-Modules_FindQt4.cmake new file mode 100644 index 000000000000..7667e25d09f2 --- /dev/null +++ b/devel/cmake/files/patch-Modules_FindQt4.cmake @@ -0,0 +1,23 @@ +--- ./Modules/FindQt4.cmake.orig 2008-01-21 19:59:51.000000000 +0100 ++++ ./Modules/FindQt4.cmake 2008-04-25 21:45:15.000000000 +0200 +@@ -250,7 +250,7 @@ + + 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 ++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake-qt4 qmake4 qmake PATHS + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin" + "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin" +@@ -790,9 +790,9 @@ + "${QT_UIC_EXECUTABLE_INTERNAL}" QT_UIC_EXECUTABLE_INTERNAL) + + SET(QT_MOC_EXECUTABLE +- ${QT_MOC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The 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") ++ ${QT_UIC_EXECUTABLE_INTERNAL} CACHE FILEPATH "The uic executable" FORCE) + + FIND_PROGRAM(QT_UIC3_EXECUTABLE + NAMES uic3 |