From 1a5fe3047ede1fe2657101e79e1738176fe053a0 Mon Sep 17 00:00:00 2001 From: Clinton Stimpson Date: Thu, 8 Nov 2007 12:27:18 -0500 Subject: [PATCH] BUG: handle qmake returning multiple paths for mkspecs. Fixes #5935 --- Modules/FindQt4.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake index d8abca3e4..c80c2c4dd 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