diff options
| author | David Cole <david.cole@kitware.com> | 2012-02-21 20:58:06 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-02-21 20:58:06 (GMT) |
| commit | bf6560091d2d3cc2c57852d414580643036a1974 (patch) | |
| tree | 34178f102add75b1eb91a1c7c3b724a1387985f5 | |
| parent | 0c00c179380ea5c6d8507249329551b1c63ac91b (diff) | |
| parent | f5066217db3911754006ae64e2a9001382ff66e1 (diff) | |
| download | CMake-bf6560091d2d3cc2c57852d414580643036a1974.zip CMake-bf6560091d2d3cc2c57852d414580643036a1974.tar.gz CMake-bf6560091d2d3cc2c57852d414580643036a1974.tar.bz2 | |
Merge topic 'qt3-find-qtmain'
f506621 Fix paths/hints for finding qtmain.
| -rw-r--r-- | Modules/FindQt3.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake index bacbb07..86236cc 100644 --- a/Modules/FindQt3.cmake +++ b/Modules/FindQt3.cmake @@ -183,11 +183,14 @@ ENDIF(QT_UIC_EXECUTABLE) IF (WIN32) FIND_LIBRARY(QT_QTMAIN_LIBRARY qtmain + HINTS + $ENV{QTDIR}/lib "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib" + PATHS "$ENV{ProgramFiles}/qt/lib" - $ENV{QTDIR}/lib "C:/Program Files/qt/lib" + "C:/Program Files/qt/lib" DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise." ) ENDIF (WIN32) |