[Cmake-commits] CMake branch, next, updated. v2.8.6-2189-ga32595a

[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  a32595ab011d8b5159967943f9d323e60cb13258 (commit)
       via  4e9274e95498e7bf30d912ca6f7fbbb6d6ab970b (commit)
      from  f4d10ce77d76df8275e105632d1e7aff84d23b59 (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=a32595ab011d8b5159967943f9d323e60cb13258
commit a32595ab011d8b5159967943f9d323e60cb13258
Merge: f4d10ce 4e9274e
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Dec 13 11:45:21 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 13 11:45:21 2011 -0500

    Merge topic 'qt4-deploy-module' into next
    
    4e9274e Unset configurations variable when no build type.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e9274e95498e7bf30d912ca6f7fbbb6d6ab970b
commit 4e9274e95498e7bf30d912ca6f7fbbb6d6ab970b
Author:     Mike McQuaid <mike at mikemcquaid.com>
AuthorDate: Tue Dec 13 16:24:39 2011 +0000
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Dec 13 09:39:53 2011 -0700

    Unset configurations variable when no build type.

diff --git a/Modules/DeployQt4.cmake b/Modules/DeployQt4.cmake
index 5350301..80a13d4 100644
--- a/Modules/DeployQt4.cmake
+++ b/Modules/DeployQt4.cmake
@@ -204,6 +204,8 @@ function(install_qt4_plugin_path plugin executable copy installed_plugin_path_va
                 else()
                         if(configurations AND (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE))
                                 set(configurations CONFIGURATIONS ${configurations})
+                        else()
+                                unset(configurations)
                         endif()
                         if(component)
                                 set(component COMPONENT ${component})

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

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


hooks/post-receive
-- 
CMake