[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3317-gc5f1931

[Brad King]

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  c5f19319132e82f3280fadfc6740900dca4383e0 (commit)
       via  969e7ee5df77b5856e26633273547700a40f48a2 (commit)
      from  fa93f09389a9266ade636ba1c0dd6ab97945083e (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=c5f19319132e82f3280fadfc6740900dca4383e0
commit c5f19319132e82f3280fadfc6740900dca4383e0
Merge: fa93f09 969e7ee
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 24 10:46:44 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 24 10:46:44 2013 -0400

    Merge topic 'fix-FindQt4-available-modules' into next
    
    969e7ee FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=969e7ee5df77b5856e26633273547700a40f48a2
commit 969e7ee5df77b5856e26633273547700a40f48a2
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Jul 22 14:27:22 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 24 10:46:00 2013 -0400

    FindQt4: 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 4c05cc0..d821ff9 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -881,20 +881,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
@@ -1055,8 +1051,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
       )
@@ -1064,9 +1060,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:


hooks/post-receive
-- 
CMake