[Cmake-commits] CMake branch, next, updated. v2.8.6-1874-gc10deda

[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  c10dedab552492299476ec1b9428c36581ac62b5 (commit)
       via  b688f114c9b3c951c6d4640412d33b70974a1dc6 (commit)
      from  98094a28c599c9d9faa13bb38a9989be7bcabefa (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=c10dedab552492299476ec1b9428c36581ac62b5
commit c10dedab552492299476ec1b9428c36581ac62b5
Merge: 98094a2 b688f11
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Mon Nov 14 12:00:20 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 14 12:00:20 2011 -0500

    Merge topic 'qt4-deploy-module' into next
    
    b688f11 Check QtCore without warning.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b688f114c9b3c951c6d4640412d33b70974a1dc6
commit b688f114c9b3c951c6d4640412d33b70974a1dc6
Author:     Mike McQuaid <mike at mikemcquaid.com>
AuthorDate: Mon Nov 14 16:34:10 2011 +0000
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Mon Nov 14 10:00:08 2011 -0700

    Check QtCore without warning.
    
    When debug and release versions of QtCore were available it printed
    a warning. This has been fixed.

diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index 4bf1b6c..5350301 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -250,7 +250,11 @@ function(install_qt4_executable executable)
         endif()
 
         get_filename_component(executable_absolute "${executable}" ABSOLUTE)
-        gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY}" qtcore_type)
+        if(EXISTS "${QT_QTCORE_LIBRARY_RELEASE}")
+            gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_RELEASE}" qtcore_type)
+        elseif(EXISTS "${QT_QTCORE_LIBRARY_DEBUG}")
+            gp_file_type("${executable_absolute}" "${QT_QTCORE_LIBRARY_DEBUG}" qtcore_type)
+        endif()
         if(qtcore_type STREQUAL "system")
                 set(qt_plugins_dir "")
         endif()

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

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


hooks/post-receive
-- 
CMake