kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: handle qmake returning multiple paths for mkspecs. Fixes #5935

This commit is contained in:
Clinton Stimpson 2007-11-08 12:27:18 -05:00
parent 46bdfe1d7b
commit 1a5fe3047e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/FindQt4.cmake
View File

@ -375,8 +375,11 @@ IF (QT4_QMAKE_FOUND)
IF (NOT QT_MKSPECS_DIR) IF (NOT QT_MKSPECS_DIR)
EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE} EXEC_PROGRAM( ${QT_QMAKE_EXECUTABLE}
ARGS "-query QMAKE_MKSPECS" ARGS "-query QMAKE_MKSPECS"
OUTPUT_VARIABLE qt_mkspecs_dir ) OUTPUT_VARIABLE qt_mkspecs_dirs )
SET(QT_MKSPECS_DIR ${qt_mkspecs_dir} CACHE PATH "The location of the Qt mkspecs") 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) ENDIF (NOT QT_MKSPECS_DIR)
# ask qmake for the plugins directory # ask qmake for the plugins directory