[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3269-g5c61140

[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  5c611402de0f8af1893e36d635b241ed61015949 (commit)
       via  aed9e0b7a7f62dbe7d71e7c36295bd11ee6866e1 (commit)
       via  7dcf63e8a5c3c764b7d99162f508e228d212d034 (commit)
       via  56e653840055a860c7deaf5e8ef355065a0b807a (commit)
       via  5f4daff8f51b439e9b7190d3e83d96aebd00adef (commit)
      from  ffb7b8b6e503dc475776cab57d34e1648904c0d9 (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=5c611402de0f8af1893e36d635b241ed61015949
commit 5c611402de0f8af1893e36d635b241ed61015949
Merge: ffb7b8b aed9e0b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 22 08:31:39 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 22 08:31:39 2013 -0400

    Merge topic 'fix-FindQt4-available-modules' into next
    
    aed9e0b Don't use Qt component _FOUND vars before they're defined (#14286).
    7dcf63e CMake Nightly Date Stamp
    56e6538 CMake Nightly Date Stamp
    5f4daff CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aed9e0b7a7f62dbe7d71e7c36295bd11ee6866e1
commit aed9e0b7a7f62dbe7d71e7c36295bd11ee6866e1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 22 14:27:22 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Jul 22 14:30:05 2013 +0200

    Don't use Qt component _FOUND vars before they're defined (#14286).
    
    This fixes a regression introduced by commit b8af46cb (FindQt4: Don't
    fail if certain Qt modules are unavailable., 2013-05-23)
    
    The _FOUND variable is set by the _QT4_ADJUST_LIB_VARS macro, so
    invoke that unconditionally, and guard only the set_property calls,
    as described in the original bug report (#14165).

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 7b37e1e..7e9caa2 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -886,20 +886,16 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   endforeach()
 
   if(Q_WS_WIN)
-    if (QT_QAXCONTAINER_FOUND)
-      set(QT_MODULES ${QT_MODULES} QAxContainer)
-      # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
-      find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
-        PATHS ${QT_HEADERS_DIR}/ActiveQt
-        NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
-        )
-    endif()
-    if (QT_QAXSERVER_FOUND)
-      find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt
-        PATHS ${QT_HEADERS_DIR}/ActiveQt
-        NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
-        )
-    endif()
+    set(QT_MODULES ${QT_MODULES} QAxContainer)
+    # Set QT_AXCONTAINER_INCLUDE_DIR and QT_AXSERVER_INCLUDE_DIR
+    find_path(QT_QAXCONTAINER_INCLUDE_DIR ActiveQt
+      PATHS ${QT_HEADERS_DIR}/ActiveQt
+      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+      )
+    find_path(QT_QAXSERVER_INCLUDE_DIR ActiveQt
+      PATHS ${QT_HEADERS_DIR}/ActiveQt
+      NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH
+      )
   endif()
 
   # Set QT_QTDESIGNERCOMPONENTS_INCLUDE_DIR
@@ -1060,8 +1056,8 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
   if(Q_WS_WIN)
     _QT4_ADJUST_LIB_VARS(qtmain)
 
+    _QT4_ADJUST_LIB_VARS(QAxServer)
     if(QT_QAXSERVER_FOUND)
-      _QT4_ADJUST_LIB_VARS(QAxServer)
       set_property(TARGET Qt4::QAxServer PROPERTY
         INTERFACE_QT4_NO_LINK_QTMAIN ON
       )
@@ -1069,9 +1065,7 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
         COMPATIBLE_INTERFACE_BOOL QT4_NO_LINK_QTMAIN)
     endif()
 
-    if(QT_QAXCONTAINER_FOUND)
-      _QT4_ADJUST_LIB_VARS(QAxContainer)
-    endif()
+    _QT4_ADJUST_LIB_VARS(QAxContainer)
   endif()
 
   # Only public dependencies are listed here.

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

Summary of changes:
 Modules/FindQt4.cmake     |   30 ++++++++++++------------------
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 13 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake