[Cmake-commits] CMake branch, next, updated. v2.8.5-1669-g6ed1896

[Alexander Neundorf]

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  6ed1896f606a5048c334e6a50297b6054f66d56e (commit)
       via  98472e45c86d0b8592e0a6361d392bfab921b3a0 (commit)
      from  6bdbb01da1f9fca7cb0bbf317ed4edd46adadbb9 (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=6ed1896f606a5048c334e6a50297b6054f66d56e
commit 6ed1896f606a5048c334e6a50297b6054f66d56e
Merge: 6bdbb01 98472e4
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 22 15:20:51 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 22 15:20:51 2011 -0400

    Merge topic 'UsingCMakeLikePkgConfig2' into next
    
    98472e4 Require the current cmake version in --find-package mode


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98472e45c86d0b8592e0a6361d392bfab921b3a0
commit 98472e45c86d0b8592e0a6361d392bfab921b3a0
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 22 21:23:55 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Aug 22 21:23:55 2011 +0200

    Require the current cmake version in --find-package mode
    
    This fixes the problem that otherwise Platforms/CYGWIN.cmake doesn't
    know whether it should set WIN32 or not.
    Now it uses always the current behaviour.
    
    Alex

diff --git a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake
index a8674aa..e0b5885 100644
--- a/Modules/CMakeFindPackageMode.cmake
+++ b/Modules/CMakeFindPackageMode.cmake
@@ -37,6 +37,9 @@ if(NOT MODE)
   message(FATAL_ERROR "MODE argument not specified. Use either EXIST, COMPILE or LINK.")
 endif()
 
+# require the current version. If we don't do this, Platforms/CYGWIN.cmake complains because
+# it doesn't know whether it should set WIN32 or not:
+cmake_minimum_required(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} )
 
 include(CMakeDetermineSystem)
 

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

Summary of changes:
 Modules/CMakeFindPackageMode.cmake |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake