diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-12 13:32:21 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-09-12 13:32:21 (GMT) |
| commit | 34170ed52e351b4e5daf8334d2ba1abe0dd2f7f9 (patch) | |
| tree | 407214f768bdb10b027ac6960506674c6d19e567 /Modules/FindQt4.cmake | |
| parent | 4dabf40ce353afb6d10564e143f92683ef44edf0 (diff) | |
| download | CMake-34170ed52e351b4e5daf8334d2ba1abe0dd2f7f9.zip CMake-34170ed52e351b4e5daf8334d2ba1abe0dd2f7f9.tar.gz CMake-34170ed52e351b4e5daf8334d2ba1abe0dd2f7f9.tar.bz2 | |
ENH: more qt changes
Diffstat (limited to 'Modules/FindQt4.cmake')
| -rw-r--r-- | Modules/FindQt4.cmake | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index 3ef7c65..59cc2d1 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -115,10 +115,21 @@ IF (WIN32) SET(QT_DEFINITIONS -DQT_DLL) ENDIF(WIN32) +FILE(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/) +SET(GLOB_TEMP_VAR) +IF(GLOB_TEMP_VAR) + SET(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR}) +ENDIF(GLOB_TEMP_VAR) +SET(GLOB_TEMP_VAR) +FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-4*/bin/) +IF(GLOB_TEMP_VAR) + SET(QT4_PATHS ${QT4_PATHS} ${GLOB_TEMP_VAR}) +ENDIF(GLOB_TEMP_VAR) # check for qmake FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake PATHS "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin" $ENV{QTDIR}/bin + ${QT4_PATHS} ) IF(QT_QMAKE_EXECUTABLE) EXEC_PROGRAM(${QMAKE_PATH} ARGS "-query QT_VERSION" @@ -162,8 +173,13 @@ IF(QT4_QMAKE_FOUND) SET(QT_HEADERS_DIR ${qt_headers} CACHE INTERNAL "") ENDIF(QT_QMAKE_EXECUTABLE) ENDIF (NOT QT_HEADERS_DIR) + FILE(GLOB GLOB_TEMP_VAR /usr/local/qt-x11-commercial-3*/include/Qt/) + SET(QT_PATH_INCLUDE ${GLOB_TEMP_VAR}) + FILE(GLOB GLOB_TEMP_VAR /usr/local/Trolltech/Qt-4*/include/Qt/) + SET(QT_PATH_INCLUDE ${GLOB_TEMP_VAR}) FIND_PATH( QT_QT_INCLUDE_DIR qglobal.h "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/include/Qt" + ${QT_PATH_INCLUDE} ${QT_HEADERS_DIR}/Qt ${QT_LIBRARY_DIR}/QtCore.framework/Headers $ENV{QTDIR}/include/Qt |