diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2007-11-08 17:27:18 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2007-11-08 17:27:18 (GMT) |
| commit | 1a5fe3047ede1fe2657101e79e1738176fe053a0 (patch) | |
| tree | ea51561ab8f20f16aba7db34d8079200bb924c83 | |
| parent | 46bdfe1d7be4218aeb1113ff0c1f257ca7b9f3d9 (diff) | |
| download | CMake-1a5fe3047ede1fe2657101e79e1738176fe053a0.zip CMake-1a5fe3047ede1fe2657101e79e1738176fe053a0.tar.gz CMake-1a5fe3047ede1fe2657101e79e1738176fe053a0.tar.bz2 | |
BUG: handle qmake returning multiple paths for mkspecs. Fixes #5935
| -rw-r--r-- | Modules/FindQt4.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index d8abca3..c80c2c4 100644 --- a/Modules/FindQt4.cmake +++ b/Modules/FindQt4.cmake @@ -375,8 +375,11 @@ IF (QT4_QMAKE_FOUND) IF (NOT QT_MKSPECS_DIR) EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE} ARGS "-query QMAKE_MKSPECS" - OUTPUT_VARIABLE qt_mkspecs_dir ) - SET(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs") + OUTPUT_VARIABLE qt_mkspecs_dirs ) + STRING(REPLACE ":" ";" qt_mkspecs_dirs "${qt_mkspecs_dirs}") + FIND_PATH(QT_MKSPECS_DIR qconfig.pri PATHS ${qt_mkspecs_dirs} + DOC "The location of the Qt mkspecs containing qconfig.pri" + NO_DEFAULT_PATH ) ENDIF (NOT QT_MKSPECS_DIR) # ask qmake for the plugins directory |