diff options
| author | Rolf Eike Beer <eike@sf-mail.de> | 2012-03-02 16:31:34 (GMT) |
|---|---|---|
| committer | Rolf Eike Beer <eike@sf-mail.de> | 2012-03-02 17:08:37 (GMT) |
| commit | 678c24d230d7abcdb2ace778d59b8c1286d86a8a (patch) | |
| tree | 9e400c0024987be29c1fefad54d200e8d24452be | |
| parent | 91a1670f47c0836c93d7bf355591bf84ecb3f99f (diff) | |
| download | CMake-678c24d230d7abcdb2ace778d59b8c1286d86a8a.zip CMake-678c24d230d7abcdb2ace778d59b8c1286d86a8a.tar.gz CMake-678c24d230d7abcdb2ace778d59b8c1286d86a8a.tar.bz2 | |
FindQt3: fix detection of Qt3 include directory
The include directory is likely not inside ../bin
| -rw-r--r-- | Modules/FindQt3.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/FindQt3.cmake b/Modules/FindQt3.cmake index 89276ef..2d8dbde 100644 --- a/Modules/FindQt3.cmake +++ b/Modules/FindQt3.cmake @@ -47,13 +47,16 @@ IF(QT4_FOUND) ENDIF(QT4_FOUND) -FILE(GLOB GLOB_PATHS_BIN /usr/lib/qt-3*/bin/) +FILE(GLOB GLOB_PATHS /usr/lib/qt-3*) +FOREACH(GLOB_PATH ${GLOB_PATHS}) + LIST(APPEND GLOB_PATHS_BIN "${GLOB_PATH}/bin") +ENDFOREACH(GLOB_PATH) FIND_PATH(QT_INCLUDE_DIR qt.h "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt" "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt" $ENV{QTDIR}/include - ${GLOB_PATHS_BIN} + ${GLOB_PATHS} /usr/local/qt/include /usr/lib/qt/include /usr/lib/qt3/include |