[cmake-commits] clinton committed FindQt4.cmake 1.76 1.77

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv22877

Modified Files:
	FindQt4.cmake 
Log Message:
BUG:  handle qmake returning multiple paths for mkspecs.  Fixes #5935


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- FindQt4.cmake	8 Nov 2007 15:56:13 -0000	1.76
+++ FindQt4.cmake	8 Nov 2007 17:27:18 -0000	1.77
@@ -375,8 +375,11 @@
   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