[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3346-gb2381d5

[Stephen Kelly]

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  b2381d50edb6a2b81d235b237ea452ec72ad7fee (commit)
       via  d57c1c1b9ed3d93d2edd1427169c689a813e21b1 (commit)
      from  c8e807b52e9dc2a4a01eb4b63a744771c19a92cb (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=b2381d50edb6a2b81d235b237ea452ec72ad7fee
commit b2381d50edb6a2b81d235b237ea452ec72ad7fee
Merge: c8e807b d57c1c1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 24 12:01:47 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 24 12:01:47 2013 -0400

    Merge topic 'fix-FindQt4-available-modules' into next
    
    d57c1c1 FindQt4: Re-add QAxServer to the QT_MODULES.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d57c1c1b9ed3d93d2edd1427169c689a813e21b1
commit d57c1c1b9ed3d93d2edd1427169c689a813e21b1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 24 17:59:13 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jul 24 17:59:13 2013 +0200

    FindQt4: Re-add QAxServer to the QT_MODULES.
    
    This was removed instead of moved in commit b8af46cb (FindQt4: Don't
    fail if certain Qt modules are unavailable.).

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index d821ff9..6e0f69e 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -881,7 +881,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   endforeach()
 
   if(Q_WS_WIN)
-    set(QT_MODULES ${QT_MODULES} QAxContainer)
+    set(QT_MODULES ${QT_MODULES} QAxContainer QAxServer)
     # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
     find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
       PATHS ${QT_HEADERS_DIR}/ActiveQt

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

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


hooks/post-receive
-- 
CMake