[Cmake-commits] CMake branch, next, updated. v2.8.3-1567-g275d6b6

[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  275d6b6729eec8faaa82b6158881bf6367cd3d92 (commit)
       via  7a1027a1b6d1544bae9329f42c0872a551859572 (commit)
      from  4504b01cec8ae3b30787ad122ed393d9237405e3 (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=275d6b6729eec8faaa82b6158881bf6367cd3d92
commit 275d6b6729eec8faaa82b6158881bf6367cd3d92
Merge: 4504b01 7a1027a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Feb 4 09:02:43 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Feb 4 09:02:43 2011 -0500

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a1027a1b6d1544bae9329f42c0872a551859572
commit 7a1027a1b6d1544bae9329f42c0872a551859572
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Feb 3 16:37:04 2011 -0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Feb 4 09:01:55 2011 -0500

    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 ec04cd2..31fa43c 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1112,7 +1112,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:


hooks/post-receive
-- 
CMake