[Cmake-commits] [cmake-commits] king committed cmCMakeMinimumRequired.h 1.12 1.13 cmPolicies.cxx 1.23 1.24

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv4609/Source

Modified Files:
	cmCMakeMinimumRequired.h cmPolicies.cxx 
Log Message:
ENH: Clarify documentation of policy CMP0000 and its relationship with cmake_minimum_required.


Index: cmPolicies.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmPolicies.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** cmPolicies.cxx	13 Mar 2008 21:11:57 -0000	1.23
--- cmPolicies.cxx	13 Mar 2008 21:32:13 -0000	1.24
***************
*** 91,103 ****
      "CMake requires that projects specify the version of CMake to which "
      "they have been written.  "
!     "This policy has been put in place to help CMake maintain backwards "
!     "compatibility with existing projects while allowing it to evolve "
!     "more rapidly.\n"
      "The easiest way to specify a policy version number is to "
!     "call the cmake_policy command at the top of your CMakeLists file:\n"
      "  cmake_policy(VERSION <major>.<minor>)\n"
!     "where <major>.<minor> is the version of CMake you want to support.  "
!     "The cmake_minimum_required command may also be used; see its "
!     "documentation for details.",
      2,6,0, cmPolicies::WARN
      );
--- 91,110 ----
      "CMake requires that projects specify the version of CMake to which "
      "they have been written.  "
!     "This policy has been put in place to help existing projects build with "
!     "new CMake versions as it evolves.  "
      "The easiest way to specify a policy version number is to "
!     "call the cmake_minimum_required command at the top of "
!     "your CMakeLists.txt file:\n"
!     "  cmake_minimum_required(VERSION <major>.<minor>)\n"
!     "where \"<major>.<minor>\" is the version of CMake you want to support "
!     "(such as \"2.6\").  "
!     "The command will ensure that at least the given version of CMake is "
!     "running and set the policy version.  "
!     "See documentation of cmake_minimum_required for details.  "
!     "The cmake_policy command may be used at any time to set the "
!     "policy version:\n"
      "  cmake_policy(VERSION <major>.<minor>)\n"
!     "This is the recommended way to set the policy version except at "
!     "the very top of a project.",
      2,6,0, cmPolicies::WARN
      );

Index: cmCMakeMinimumRequired.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCMakeMinimumRequired.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** cmCMakeMinimumRequired.h	7 Mar 2008 20:30:32 -0000	1.12
--- cmCMakeMinimumRequired.h	13 Mar 2008 21:32:13 -0000	1.13
***************
*** 70,78 ****
        "                         [FATAL_ERROR])\n"
        "If the current version of CMake is lower than that required "
!       "it will stop processing the project and report an error.\n"
        "When a version higher than 2.4 is specified the command implicitly "
        "invokes\n"
        "  cmake_policy(VERSION major[.minor[.patch]])\n"
!       "which sets the cmake policy version level to the version specified.\n"
        "When version 2.4 or lower is given the command implicitly invokes\n"
        "  cmake_policy(VERSION 2.4)\n"
--- 70,78 ----
        "                         [FATAL_ERROR])\n"
        "If the current version of CMake is lower than that required "
!       "it will stop processing the project and report an error.  "
        "When a version higher than 2.4 is specified the command implicitly "
        "invokes\n"
        "  cmake_policy(VERSION major[.minor[.patch]])\n"
!       "which sets the cmake policy version level to the version specified.  "
        "When version 2.4 or lower is given the command implicitly invokes\n"
        "  cmake_policy(VERSION 2.4)\n"