[Cmake-commits] CMake branch, next, updated. v2.8.3-1563-gba05ed6

[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  ba05ed60f9ac362a36500a2a9bbb5b7fcdb578b9 (commit)
       via  72e9d3cc63eacd1cd5b39f0951530480d453a7d0 (commit)
      from  f4902c9c2a9f41ed65d8f6b8d26014bbad18812f (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=ba05ed60f9ac362a36500a2a9bbb5b7fcdb578b9
commit ba05ed60f9ac362a36500a2a9bbb5b7fcdb578b9
Merge: f4902c9 72e9d3c
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Feb 3 18:37:05 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 3 18:37:05 2011 -0500

    Merge topic 'qt4-fphsa' into next
    
    72e9d3c When checking find_package() components, special case qtmain.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72e9d3cc63eacd1cd5b39f0951530480d453a7d0
commit 72e9d3cc63eacd1cd5b39f0951530480d453a7d0
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Feb 3 16:37:04 2011 -0700
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Feb 3 16:37:04 2011 -0700

    When checking find_package() components, special case qtmain.
    
    Its just a library on Windows only.
    Fixes bug #11791.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 5bceb47..064ff23 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1115,7 +1115,13 @@ IF( Qt4_FIND_COMPONENTS )
   SET(_QT4_FOUND_REQUIRED_VARS QT_QMAKE_EXECUTABLE QT_MOC_EXECUTABLE QT_RCC_EXECUTABLE QT_INCLUDE_DIR QT_LIBRARY_DIR)
   FOREACH( component ${Qt4_FIND_COMPONENTS} )
     STRING( TOUPPER ${component} _COMPONENT )
-    SET(_QT4_FOUND_REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS} QT_${_COMPONENT}_INCLUDE_DIR QT_${_COMPONENT}_LIBRARY)
+    if(${_COMPONENT} STREQUAL "QTMAIN")
+      IF(Q_WS_WIN)
+        SET(_QT4_FOUND_REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS} QT_${_COMPONENT}_LIBRARY)
+      ENDIF(Q_WS_WIN)
+    else(${_COMPONENT} STREQUAL "QTMAIN")
+      SET(_QT4_FOUND_REQUIRED_VARS ${_QT4_FOUND_REQUIRED_VARS} QT_${_COMPONENT}_INCLUDE_DIR QT_${_COMPONENT}_LIBRARY)
+    endif(${_COMPONENT} STREQUAL "QTMAIN")
   ENDFOREACH( component )
 
   if(Qt4_FIND_COMPONENTS MATCHES QtGui)

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

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


hooks/post-receive
-- 
CMake