[Cmake-commits] CMake branch, next, updated. v2.8.8-2954-g15dc69a

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  15dc69afa4dd3c8670b6e0472af9c08ec03c5440 (commit)
       via  ad7c80cd9f5b50f39e32f1874a3c1ec4b2e82c44 (commit)
      from  0126bc8daa129f74488ab689ff3990aae1eb732f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15dc69afa4dd3c8670b6e0472af9c08ec03c5440
commit 15dc69afa4dd3c8670b6e0472af9c08ec03c5440
Merge: 0126bc8 ad7c80c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue May 29 16:58:14 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 29 16:58:14 2012 -0400

    Merge topic 'qt4-phonon-backend' into next
    
    ad7c80c Added conditional for the phonon backend plugin.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad7c80cd9f5b50f39e32f1874a3c1ec4b2e82c44
commit ad7c80cd9f5b50f39e32f1874a3c1ec4b2e82c44
Author:     Kurtis Nusbaum <klnusbaum at gmail.com>
AuthorDate: Tue May 29 14:49:16 2012 -0500
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue May 29 14:56:07 2012 -0600

    Added conditional for the phonon backend plugin.
    
    If on APPLE, the phonon backend plugin is set to phonon_qt7. If on WIN32, the phonon backend plugin is set to phonon_ds9. I did not add any for generic UNIXes as they could have a whole host of things. A more comprehensive script would actually attempt to detect which phonon plugins were installed. However, this is a simple fix for now that will work for most people.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 9b646b4..226a4b1 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1059,7 +1059,11 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
   SET( QT_IMAGEFORMATS_PLUGINS qgif qjpeg qmng qico qsvg qtiff  )
   SET( QT_INPUTMETHODS_PLUGINS qimsw_multi )
   SET( QT_MOUSEDRIVERS_PLUGINS qwstslibmousehandler )
-  SET( QT_PHONON_BACKEND_PLUGINS phonon_qt7 )
+  IF(APPLE)
+    SET( QT_PHONON_BACKEND_PLUGINS phonon_qt7 )
+  ELSEIF(WIN32)
+    SET( QT_PHONON_BACKEND_PLUGINS phonon_ds9 )
+  ENDIF()
   SET( QT_SCRIPT_PLUGINS qtscriptdbus )
   SET( QT_SQLDRIVERS_PLUGINS qsqldb2 qsqlibase qsqlite qsqlite2 qsqlmysql qsqloci qsqlodbc qsqlpsql qsqltds )
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindQt4.cmake |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake