summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClinton Stimpson <clinton@elemtech.com>2010-01-13 22:34:31 (GMT)
committerClinton Stimpson <clinton@elemtech.com>2010-01-13 22:34:31 (GMT)
commit55a3967edac59cd0fdd7605b4f56404da01833fc (patch)
tree1f49bb510c271f86c1b2343b4d8c4db384468bd3
parente46e8fb937a4d4d5e2ce7018d73cde7d85ea3142 (diff)
downloadCMake-55a3967edac59cd0fdd7605b4f56404da01833fc.zip
CMake-55a3967edac59cd0fdd7605b4f56404da01833fc.tar.gz
CMake-55a3967edac59cd0fdd7605b4f56404da01833fc.tar.bz2
Fix bug #10114. Find phonon on some installations.
-rw-r--r--Modules/FindQt4.cmake10
1 files changed, 10 insertions, 0 deletions
diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 01bf95e..063c4f5 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -670,6 +670,16 @@ IF (QT4_QMAKE_FOUND)
${QT_LIBRARY_DIR}/${QT_MODULE}.framework/Headers
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)
IF(WIN32)