[Cmake-commits] [cmake-commits] clinton committed FindQt4.cmake 1.185 1.186

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
Fix bug #10114. Find phonon on some installations.


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.185
retrieving revision 1.186
diff -C 2 -d -r1.185 -r1.186
*** FindQt4.cmake	23 Dec 2009 14:58:34 -0000	1.185
--- FindQt4.cmake	13 Jan 2010 22:34:31 -0000	1.186
***************
*** 671,674 ****
--- 671,684 ----
                NO_DEFAULT_PATH
        )
+     # phonon doesn't seem consistent, let's try phonondefs.h for some
+     # installations
+     IF(${QT_MODULE} STREQUAL "phonon")
+       FIND_PATH(QT_${_upper_qt_module}_INCLUDE_DIR phonondefs.h
+                 PATHS
+                 ${QT_HEADERS_DIR}/${QT_MODULE}
+                 ${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
+                 NO_DEFAULT_PATH
+         )
+     ENDIF(${QT_MODULE} STREQUAL "phonon")
    ENDFOREACH(QT_MODULE)