[Cmake-commits] CMake branch, next, updated. v2.8.3-1448-g9efb320

Brad King brad.king at kitware.com
Thu Jan 20 12:04:00 EST 2011


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  9efb320e3bde9d080a8f4af33016a8354fba60df (commit)
       via  4c1c358332e9dd2b9ec165450f64d3a542e3433a (commit)
      from  7e05f2022b860b00c67d7e2fb930c52fe52a9f3a (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=9efb320e3bde9d080a8f4af33016a8354fba60df
commit 9efb320e3bde9d080a8f4af33016a8354fba60df
Merge: 7e05f20 4c1c358
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 20 12:03:56 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 20 12:03:56 2011 -0500

    Merge topic 'qt4-fphsa' into next
    
    4c1c358 FindQt4: Include builtin FindPackageHandleStandardArgs directly


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4c1c358332e9dd2b9ec165450f64d3a542e3433a
commit 4c1c358332e9dd2b9ec165450f64d3a542e3433a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 20 11:45:39 2011 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 20 11:46:32 2011 -0500

    FindQt4: Include builtin FindPackageHandleStandardArgs directly
    
    Apply to FindQt4 change from commit b0118402 (Use absolute path to
    FindPackageHandleStandardArgs.cmake everywhere, 2010-09-28).

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 70e69b0..ec04cd2 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -354,7 +354,7 @@ ENDIF(QT_QT_LIBRARY)
 
 INCLUDE(CheckSymbolExists)
 INCLUDE(MacroAddFileDependencies)
-INCLUDE(FindPackageHandleStandardArgs)
+INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
 
 SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
 

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list