[Cmake-commits] [cmake-commits] martink committed cmCMakePolicyCommand.h 1.3 1.4 cmListFileCache.cxx 1.39 1.40 cmLocalGenerator.cxx 1.268 1.269 cmMakefile.cxx 1.460 1.461 cmPolicies.cxx 1.18 1.19 cmPolicies.h 1.9 1.10 cmake.cxx 1.371 1.372
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Mar 13 11:38:48 EDT 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv3930/Source
Modified Files:
cmCMakePolicyCommand.h cmListFileCache.cxx
cmLocalGenerator.cxx cmMakefile.cxx cmPolicies.cxx
cmPolicies.h cmake.cxx
Log Message:
ENH: change CMP_ to CMP
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.268
retrieving revision 1.269
diff -C 2 -d -r1.268 -r1.269
*** cmLocalGenerator.cxx 7 Mar 2008 20:30:33 -0000 1.268
--- cmLocalGenerator.cxx 13 Mar 2008 15:38:46 -0000 1.269
***************
*** 2674,2678 ****
// Check the policy to decide whether to pay attention to this
// variable.
! switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP_0001))
{
case cmPolicies::WARN:
--- 2674,2678 ----
// Check the policy to decide whether to pay attention to this
// variable.
! switch(this->Makefile->GetPolicyStatus(cmPolicies::CMP0001))
{
case cmPolicies::WARN:
Index: cmListFileCache.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmListFileCache.cxx,v
retrieving revision 1.39
retrieving revision 1.40
diff -C 2 -d -r1.39 -r1.40
*** cmListFileCache.cxx 11 Mar 2008 14:29:53 -0000 1.39
--- cmListFileCache.cxx 13 Mar 2008 15:38:46 -0000 1.40
***************
*** 144,152 ****
if(!hasPolicy)
{
! switch (mf->GetPolicyStatus(cmPolicies::CMP_0000))
{
case cmPolicies::WARN:
mf->IssueMessage(cmake::AUTHOR_WARNING,
! mf->GetPolicies()->GetPolicyWarning(cmPolicies::CMP_0000)
);
--- 144,152 ----
if(!hasPolicy)
{
! switch (mf->GetPolicyStatus(cmPolicies::CMP0000))
{
case cmPolicies::WARN:
mf->IssueMessage(cmake::AUTHOR_WARNING,
! mf->GetPolicies()->GetPolicyWarning(cmPolicies::CMP0000)
);
***************
*** 157,161 ****
default:
mf->IssueMessage(cmake::FATAL_ERROR,
! mf->GetPolicies()->GetRequiredPolicyError(cmPolicies::CMP_0000)
);
return false;
--- 157,161 ----
default:
mf->IssueMessage(cmake::FATAL_ERROR,
! mf->GetPolicies()->GetRequiredPolicyError(cmPolicies::CMP0000)
);
return false;
Index: cmPolicies.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmPolicies.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C 2 -d -r1.9 -r1.10
*** cmPolicies.h 7 Mar 2008 21:36:57 -0000 1.9
--- cmPolicies.h 13 Mar 2008 15:38:46 -0000 1.10
***************
*** 41,51 ****
enum PolicyID
{
! CMP_0000, // Policy version specification
! CMP_0001, // Ignore old compatibility variable
! CMP_0002, // Target names must be unique
// Always the last entry. Useful mostly to avoid adding a comma
// the last policy when adding a new one.
! CMP_COUNT
};
--- 41,51 ----
enum PolicyID
{
! CMP0000, // Policy version specification
! CMP0001, // Ignore old compatibility variable
! CMP0002, // Target names must be unique
// Always the last entry. Useful mostly to avoid adding a comma
// the last policy when adding a new one.
! CMPCOUNT
};
Index: cmPolicies.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmPolicies.cxx,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** cmPolicies.cxx 11 Mar 2008 14:29:56 -0000 1.18
--- cmPolicies.cxx 13 Mar 2008 15:38:46 -0000 1.19
***************
*** 87,91 ****
// define all the policies
this->DefinePolicy(
! CMP_0000, "CMP_0000",
"A policy version number must be specified.",
"CMake requires that projects specify the version of CMake to which "
--- 87,91 ----
// define all the policies
this->DefinePolicy(
! CMP0000, "CMP0000",
"A policy version number must be specified.",
"CMake requires that projects specify the version of CMake to which "
***************
*** 104,108 ****
this->DefinePolicy(
! CMP_0001, "CMP_0001",
"CMAKE_BACKWARDS_COMPATIBILITY should no longer be used.",
"The OLD behavior is to check CMAKE_BACKWARDS_COMPATIBILITY and present "
--- 104,108 ----
this->DefinePolicy(
! CMP0001, "CMP0001",
"CMAKE_BACKWARDS_COMPATIBILITY should no longer be used.",
"The OLD behavior is to check CMAKE_BACKWARDS_COMPATIBILITY and present "
***************
*** 120,124 ****
this->DefinePolicy(
! CMP_0002, "CMP_0002",
"Logical target names must be globally unique.",
"Targets names created with "
--- 120,124 ----
this->DefinePolicy(
! CMP0002, "CMP0002",
"Logical target names must be globally unique.",
"Targets names created with "
***************
*** 210,214 ****
"CMAKE_BACKWARDS_COMPATIBILITY variable. "
"In order to get compatibility features supporting versions earlier "
! "than 2.4 set policy CMP_0001 to OLD to tell CMake to check the "
"CMAKE_BACKWARDS_COMPATIBILITY variable. "
"One way to so this is to set the policy version to 2.4 exactly."
--- 210,214 ----
"CMAKE_BACKWARDS_COMPATIBILITY variable. "
"In order to get compatibility features supporting versions earlier "
! "than 2.4 set policy CMP0001 to OLD to tell CMake to check the "
"CMAKE_BACKWARDS_COMPATIBILITY variable. "
"One way to so this is to set the policy version to 2.4 exactly."
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.371
retrieving revision 1.372
diff -C 2 -d -r1.371 -r1.372
*** cmake.cxx 12 Mar 2008 21:02:30 -0000 1.371
--- cmake.cxx 13 Mar 2008 15:38:46 -0000 1.372
***************
*** 3345,3349 ****
"Allow duplicate custom targets to be created.",
"Normally CMake requires that all targets built in a project have "
! "globally unique logical names (see policy CMP_0002). "
"This is necessary to generate meaningful project file names in "
"Xcode and VS IDE generators. "
--- 3345,3349 ----
"Allow duplicate custom targets to be created.",
"Normally CMake requires that all targets built in a project have "
! "globally unique logical names (see policy CMP0002). "
"This is necessary to generate meaningful project file names in "
"Xcode and VS IDE generators. "
Index: cmCMakePolicyCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCMakePolicyCommand.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cmCMakePolicyCommand.h 7 Mar 2008 20:30:32 -0000 1.3
--- cmCMakePolicyCommand.h 13 Mar 2008 15:38:46 -0000 1.4
***************
*** 81,88 ****
"will report an error. "
"In order to get compatibility features supporting versions earlier "
! "than 2.4 see documentation of policy CMP_0001."
"\n"
! " cmake_policy(SET <CMP_NNNN> NEW)\n"
! " cmake_policy(SET <CMP_NNNN> OLD)\n"
"Tell CMake to use the OLD or NEW behavior for a given policy. "
"Projects depending on the old behavior of a given policy may "
--- 81,88 ----
"will report an error. "
"In order to get compatibility features supporting versions earlier "
! "than 2.4 see documentation of policy CMP0001."
"\n"
! " cmake_policy(SET <CMPNNNN> NEW)\n"
! " cmake_policy(SET <CMPNNNN> OLD)\n"
"Tell CMake to use the OLD or NEW behavior for a given policy. "
"Projects depending on the old behavior of a given policy may "
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.460
retrieving revision 1.461
diff -C 2 -d -r1.460 -r1.461
*** cmMakefile.cxx 13 Mar 2008 01:06:32 -0000 1.460
--- cmMakefile.cxx 13 Mar 2008 15:38:46 -0000 1.461
***************
*** 3279,3287 ****
{
// target names must be globally unique
! switch (this->GetPolicyStatus(cmPolicies::CMP_0002))
{
case cmPolicies::WARN:
this->IssueMessage(cmake::AUTHOR_WARNING, this->GetPolicies()->
! GetPolicyWarning(cmPolicies::CMP_0002));
case cmPolicies::OLD:
return true;
--- 3279,3287 ----
{
// target names must be globally unique
! switch (this->GetPolicyStatus(cmPolicies::CMP0002))
{
case cmPolicies::WARN:
this->IssueMessage(cmake::AUTHOR_WARNING, this->GetPolicies()->
! GetPolicyWarning(cmPolicies::CMP0002));
case cmPolicies::OLD:
return true;
***************
*** 3289,3293 ****
case cmPolicies::REQUIRED_ALWAYS:
this->IssueMessage(cmake::FATAL_ERROR,
! this->GetPolicies()->GetRequiredPolicyError(cmPolicies::CMP_0002)
);
return true;
--- 3289,3293 ----
case cmPolicies::REQUIRED_ALWAYS:
this->IssueMessage(cmake::FATAL_ERROR,
! this->GetPolicies()->GetRequiredPolicyError(cmPolicies::CMP0002)
);
return true;
***************
*** 3334,3338 ****
e << "created in source directory \""
<< existing->GetMakefile()->GetCurrentDirectory() << "\". "
! << "See documentation for policy CMP_0002 for more details.";
msg = e.str();
return false;
--- 3334,3338 ----
e << "created in source directory \""
<< existing->GetMakefile()->GetCurrentDirectory() << "\". "
! << "See documentation for policy CMP0002 for more details.";
msg = e.str();
return false;
***************
*** 3412,3416 ****
// Special hook for presenting compatibility variable as soon as
// the user requests it.
! if(id == cmPolicies::CMP_0001 &&
(status == cmPolicies::WARN || status == cmPolicies::OLD))
{
--- 3412,3416 ----
// Special hook for presenting compatibility variable as soon as
// the user requests it.
! if(id == cmPolicies::CMP0001 &&
(status == cmPolicies::WARN || status == cmPolicies::OLD))
{
More information about the Cmake-commits
mailing list