[Cmake-commits] CMake branch, next, updated. v2.8.8-2729-g337de12

[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  337de12245c60082b5738a67557d06aa9f83f987 (commit)
       via  d960de2f5410b6ed10aabeb71e09aec19d32d9d8 (commit)
      from  23fb0b55989a27bca7e6f353a439b4b850b1f416 (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=337de12245c60082b5738a67557d06aa9f83f987
commit 337de12245c60082b5738a67557d06aa9f83f987
Merge: 23fb0b5 d960de2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 26 16:44:08 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Apr 26 16:44:08 2012 -0400

    Merge topic 'require-CMake-2.8.2' into next
    
    d960de2 Require CMake 2.8.2 or higher to build CMake


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d960de2f5410b6ed10aabeb71e09aec19d32d9d8
commit d960de2f5410b6ed10aabeb71e09aec19d32d9d8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Apr 26 16:35:55 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Apr 26 16:39:54 2012 -0400

    Require CMake 2.8.2 or higher to build CMake
    
    Update the requirement specified in the top-level CMakeLists.txt file.
    Drop the special-case minimum required version of 2.8.0 because the new
    minimum subsumes it.
    
    Revert commit 6c611c6b (libarchive: Restore CMake 2.6.3 as minimum
    version, 2012-01-05) since our requirement now subsumes libarchive's.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66f9b2d..8522cad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 #=============================================================================
 # CMake - Cross Platform Makefile Generator
-# Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
+# Copyright 2000-2012 Kitware, Inc., Insight Software Consortium
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
@@ -9,7 +9,7 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the License for more information.
 #=============================================================================
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.2 FATAL_ERROR)
 SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
 PROJECT(CMake)
 
@@ -324,10 +324,9 @@ MACRO (CMAKE_BUILD_UTILITIES)
   #---------------------------------------------------------------------
   # Build or use system libarchive for CMake and CTest.
   IF(CMAKE_USE_SYSTEM_LIBARCHIVE)
-    IF(EXISTS ${CMAKE_ROOT}/Modules/FindLibArchive.cmake)
+    IF(EXISTS ${CMAKE_ROOT}/Modules/FindLibArchive.cmake) # added in 2.8.3
       FIND_PACKAGE(LibArchive)
     ELSE()
-      CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
       INCLUDE(${CMake_SOURCE_DIR}/Modules/FindLibArchive.cmake)
     ENDIF()
     IF(NOT LibArchive_FOUND)
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 7f7a69f..ebf28ae 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 PROJECT(libarchive C)
 #
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR)
 SET(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/build/cmake")
 if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${libarchive_BINARY_DIR}/bin)

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

Summary of changes:
 CMakeLists.txt                        |    7 +++----
 Utilities/cmlibarchive/CMakeLists.txt |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake