[Cmake-commits] CMake branch, next, updated. v2.8.4-1019-g23cff09
Brad King
brad.king at kitware.com
Thu Feb 24 15:20:28 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 23cff09c020798ac7c65c7cb245b7d1051f329fc (commit)
via c3e452e944f915975d13d89023cd43ed3dba5221 (commit)
from 9ed1a639166d160c867476270a6534ccdc0b5079 (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=23cff09c020798ac7c65c7cb245b7d1051f329fc
commit 23cff09c020798ac7c65c7cb245b7d1051f329fc
Merge: 9ed1a63 c3e452e
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 24 15:20:27 2011 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Feb 24 15:20:27 2011 -0500
Merge topic 'require-cmake-2.6.3' into next
c3e452e Require at least CMake 2.6.3 to build current CMake
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c3e452e944f915975d13d89023cd43ed3dba5221
commit c3e452e944f915975d13d89023cd43ed3dba5221
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 24 15:14:08 2011 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 24 15:14:08 2011 -0500
Require at least CMake 2.6.3 to build current CMake
Remove some cruft left for supporting builds with CMake 2.4.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23525c4..7b0f6b5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
#=============================================================================
# CMake - Cross Platform Makefile Generator
-# Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+# Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
@@ -9,12 +9,9 @@
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
SET(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake >= 2.8.4 is required
PROJECT(CMake)
-IF(COMMAND CMAKE_POLICY)
- CMAKE_POLICY(SET CMP0003 NEW)
-ENDIF(COMMAND CMAKE_POLICY)
IF(CMAKE_BOOTSTRAP)
# Running from bootstrap script. Set local variable and remove from cache.
@@ -24,18 +21,8 @@ ENDIF()
MARK_AS_ADVANCED(CMAKE_BACKWARDS_COMPATIBILITY)
-# Allow empty endif() and such with CMake 2.4.
-SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS 1)
-
SET(CMake_BIN_DIR ${CMake_BINARY_DIR}/bin)
-IF(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} GREATER 2.4)
- # Since the built CMake will install itself instead of the
- # generating CMake, tell it that the install rules were generated
- # by CMake 2.4.
- INSTALL(CODE "SET(CMAKE_INSTALL_SELF_2_4 1)")
-ENDIF()
-
IF("${CMake_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")
# Disallow architecture-specific try_run. It may not run on the host.
MACRO(TRY_RUN)
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 37fced2..131661d 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -1707,7 +1707,7 @@ protected:
{
DoingType = DoingLast1,
DoingRename,
- DoingSelf24
+ DoingLast2
};
virtual bool CheckKeyword(std::string const& arg);
virtual bool CheckValue(std::string const& arg);
@@ -1846,22 +1846,12 @@ bool cmFileInstaller::CheckKeyword(std::string const& arg)
else if(arg == "COMPONENTS" || arg == "CONFIGURATIONS" ||
arg == "PROPERTIES")
{
- if(this->Makefile->IsOn("CMAKE_INSTALL_SELF_2_4"))
- {
- // When CMake 2.4 builds this CMake version we need to support
- // the install scripts it generates since it asks this CMake
- // to install itself using the rules it generated.
- this->Doing = DoingSelf24;
- }
- else
- {
- cmOStringStream e;
- e << "INSTALL called with old-style " << arg << " argument. "
- << "This script was generated with an older version of CMake. "
- << "Re-run this cmake version on your build tree.";
- this->FileCommand->SetError(e.str().c_str());
- this->Doing = DoingError;
- }
+ cmOStringStream e;
+ e << "INSTALL called with old-style " << arg << " argument. "
+ << "This script was generated with an older version of CMake. "
+ << "Re-run this cmake version on your build tree.";
+ this->FileCommand->SetError(e.str().c_str());
+ this->Doing = DoingError;
}
else
{
@@ -1884,12 +1874,6 @@ bool cmFileInstaller::CheckValue(std::string const& arg)
case DoingRename:
this->Rename = arg;
break;
- case DoingSelf24:
- // Ignore these arguments for compatibility. This should be
- // reached only when CMake 2.4 is installing the current
- // CMake. It can be removed when CMake 2.6 or higher is
- // required to build CMake.
- break;
default:
return this->cmFileCopier::CheckValue(arg);
}
diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
index 454d2d1..7030b2e 100644
--- a/Utilities/cmcurl/CMakeLists.txt
+++ b/Utilities/cmcurl/CMakeLists.txt
@@ -1,10 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
-IF(COMMAND CMAKE_POLICY)
- CMAKE_POLICY(SET CMP0003 NEW)
-ENDIF(COMMAND CMAKE_POLICY)
-IF(CMAKE_OSX_ARCHITECTURES)
- CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
-ENDIF(CMAKE_OSX_ARCHITECTURES)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
PROJECT(LIBCURL C)
# Setup package meta-data
diff --git a/Utilities/cmlibarchive/CMakeLists.txt b/Utilities/cmlibarchive/CMakeLists.txt
index 08cda1e..0b9380f 100644
--- a/Utilities/cmlibarchive/CMakeLists.txt
+++ b/Utilities/cmlibarchive/CMakeLists.txt
@@ -1,8 +1,8 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6.3 FATAL_ERROR)
#
#
PROJECT(libarchive C)
#
-CMAKE_MINIMUM_REQUIRED(VERSION 2.6.1)
SET(CMAKE_MODULE_PATH "${libarchive_SOURCE_DIR}/build/cmake")
# We use CHECK_TYPE_SIZE for existence tests, so use only one arch.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 17 ++---------------
Source/cmFileCommand.cxx | 30 +++++++-----------------------
Utilities/cmcurl/CMakeLists.txt | 8 +-------
Utilities/cmlibarchive/CMakeLists.txt | 2 +-
4 files changed, 11 insertions(+), 46 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list