[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7422-g0daa3aa
Brad King
brad.king at kitware.com
Tue Feb 4 16:20:26 EST 2014
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 0daa3aa4011efbbb760e7e8d59a5ee4227376812 (commit)
via 101057b50090412bdb13b2313053b6c151d15071 (commit)
from 272f26a995f5f67b6b7cb6962ba04fa052c4a6df (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=0daa3aa4011efbbb760e7e8d59a5ee4227376812
commit 0daa3aa4011efbbb760e7e8d59a5ee4227376812
Merge: 272f26a 101057b
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 4 16:20:25 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Feb 4 16:20:25 2014 -0500
Merge topic 'no-policy-tweak-version' into next
101057b5 Drop tweak version component from CMake Policies
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=101057b50090412bdb13b2313053b6c151d15071
commit 101057b50090412bdb13b2313053b6c151d15071
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Feb 4 16:10:15 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Feb 4 16:14:26 2014 -0500
Drop tweak version component from CMake Policies
Since commit v2.8.2~105^2~2 (Teach CMake Policies about tweak version
component, 2010-04-23), cmPolicies has known how to handle a policy
introduced in a tweak version. This was done back when we introduced
policies with the current development date version and later updated it
to the release version. Now we always introduce policies using the next
expected release version and explicitly set the policy to test the NEW
behavior.
CMake Policies (or any other features) should never be introduced in a
tweak (bugfix) release, so drop the infrastructure that allows this.
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index e191256..9cfa1e4 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -22,7 +22,6 @@ public:
unsigned int majorVersionIntroduced,
unsigned int minorVersionIntroduced,
unsigned int patchVersionIntroduced,
- unsigned int tweakVersionIntroduced,
cmPolicies::PolicyStatus status)
{
if (!idString || !shortDescription)
@@ -37,7 +36,6 @@ public:
this->MajorVersionIntroduced = majorVersionIntroduced;
this->MinorVersionIntroduced = minorVersionIntroduced;
this->PatchVersionIntroduced = patchVersionIntroduced;
- this->TweakVersionIntroduced = tweakVersionIntroduced;
this->Status = status;
}
@@ -45,18 +43,16 @@ public:
{
cmOStringStream v;
v << this->MajorVersionIntroduced << "." << this->MinorVersionIntroduced;
- v << "." << this->PatchVersionIntroduced;
- if(this->TweakVersionIntroduced > 0)
+ if(this->PatchVersionIntroduced > 0)
{
- v << "." << this->TweakVersionIntroduced;
+ v << "." << this->PatchVersionIntroduced;
}
return v.str();
}
bool IsPolicyNewerThan(unsigned int majorV,
unsigned int minorV,
- unsigned int patchV,
- unsigned int tweakV)
+ unsigned int patchV)
{
if (majorV < this->MajorVersionIntroduced)
{
@@ -74,15 +70,7 @@ public:
{
return false;
}
- if (patchV < this->PatchVersionIntroduced)
- {
- return true;
- }
- if (patchV > this->PatchVersionIntroduced)
- {
- return false;
- }
- return (tweakV < this->TweakVersionIntroduced);
+ return (patchV < this->PatchVersionIntroduced);
}
cmPolicies::PolicyID ID;
@@ -91,7 +79,6 @@ public:
unsigned int MajorVersionIntroduced;
unsigned int MinorVersionIntroduced;
unsigned int PatchVersionIntroduced;
- unsigned int TweakVersionIntroduced;
cmPolicies::PolicyStatus Status;
};
@@ -101,251 +88,251 @@ cmPolicies::cmPolicies()
this->DefinePolicy(
CMP0000, "CMP0000",
"A minimum required CMake version must be specified.",
- 2,6,0,0, cmPolicies::WARN
+ 2,6,0, cmPolicies::WARN
);
this->DefinePolicy(
CMP0001, "CMP0001",
"CMAKE_BACKWARDS_COMPATIBILITY should no longer be used.",
- 2,6,0,0, cmPolicies::WARN
+ 2,6,0, cmPolicies::WARN
);
this->DefinePolicy(
CMP0002, "CMP0002",
"Logical target names must be globally unique.",
- 2,6,0,0, cmPolicies::WARN
+ 2,6,0, cmPolicies::WARN
);
this->DefinePolicy(
CMP0003, "CMP0003",
"Libraries linked via full path no longer produce linker search paths.",
- 2,6,0,0, cmPolicies::WARN);
+ 2,6,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0004, "CMP0004",
"Libraries linked may not have leading or trailing whitespace.",
- 2,6,0,0, cmPolicies::WARN);
+ 2,6,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0005, "CMP0005",
"Preprocessor definition values are now escaped automatically.",
- 2,6,0,0, cmPolicies::WARN);
+ 2,6,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0006, "CMP0006",
"Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION.",
- 2,6,0,0, cmPolicies::WARN);
+ 2,6,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0007, "CMP0007",
"list command no longer ignores empty elements.",
- 2,6,0,0, cmPolicies::WARN);
+ 2,6,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0008, "CMP0008",
"Libraries linked by full-path must have a valid library file name.",
- 2,6,1,0, cmPolicies::WARN);
+ 2,6,1, cmPolicies::WARN);
this->DefinePolicy(
CMP0009, "CMP0009",
"FILE GLOB_RECURSE calls should not follow symlinks by default.",
- 2,6,2,0, cmPolicies::WARN);
+ 2,6,2, cmPolicies::WARN);
this->DefinePolicy(
CMP0010, "CMP0010",
"Bad variable reference syntax is an error.",
- 2,6,3,0, cmPolicies::WARN);
+ 2,6,3, cmPolicies::WARN);
this->DefinePolicy(
CMP0011, "CMP0011",
"Included scripts do automatic cmake_policy PUSH and POP.",
- 2,6,3,0, cmPolicies::WARN);
+ 2,6,3, cmPolicies::WARN);
this->DefinePolicy(
CMP0012, "CMP0012",
"if() recognizes numbers and boolean constants.",
- 2,8,0,0, cmPolicies::WARN);
+ 2,8,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0013, "CMP0013",
"Duplicate binary directories are not allowed.",
- 2,8,0,0, cmPolicies::WARN);
+ 2,8,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0014, "CMP0014",
"Input directories must have CMakeLists.txt.",
- 2,8,0,0, cmPolicies::WARN);
+ 2,8,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0015, "CMP0015",
"link_directories() treats paths relative to the source dir.",
- 2,8,1,0, cmPolicies::WARN);
+ 2,8,1, cmPolicies::WARN);
this->DefinePolicy(
CMP0016, "CMP0016",
"target_link_libraries() reports error if its only argument "
"is not a target.",
- 2,8,3,0, cmPolicies::WARN);
+ 2,8,3, cmPolicies::WARN);
this->DefinePolicy(
CMP0017, "CMP0017",
"Prefer files from the CMake module directory when including from there.",
- 2,8,4,0, cmPolicies::WARN);
+ 2,8,4, cmPolicies::WARN);
this->DefinePolicy(
CMP0018, "CMP0018",
"Ignore CMAKE_SHARED_LIBRARY_<Lang>_FLAGS variable.",
- 2,8,9,0, cmPolicies::WARN);
+ 2,8,9, cmPolicies::WARN);
this->DefinePolicy(
CMP0019, "CMP0019",
"Do not re-expand variables in include and link information.",
- 2,8,11,0, cmPolicies::WARN);
+ 2,8,11, cmPolicies::WARN);
this->DefinePolicy(
CMP0020, "CMP0020",
"Automatically link Qt executables to qtmain target on Windows.",
- 2,8,11,0, cmPolicies::WARN);
+ 2,8,11, cmPolicies::WARN);
this->DefinePolicy(
CMP0021, "CMP0021",
"Fatal error on relative paths in INCLUDE_DIRECTORIES target property.",
- 2,8,12,0, cmPolicies::WARN);
+ 2,8,12, cmPolicies::WARN);
this->DefinePolicy(
CMP0022, "CMP0022",
"INTERFACE_LINK_LIBRARIES defines the link interface.",
- 2,8,12,0, cmPolicies::WARN);
+ 2,8,12, cmPolicies::WARN);
this->DefinePolicy(
CMP0023, "CMP0023",
"Plain and keyword target_link_libraries signatures cannot be mixed.",
- 2,8,12,0, cmPolicies::WARN);
+ 2,8,12, cmPolicies::WARN);
this->DefinePolicy(
CMP0024, "CMP0024",
"Disallow include export result.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0025, "CMP0025",
"Compiler id for Apple Clang is now AppleClang.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0026, "CMP0026",
"Disallow use of the LOCATION target property.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0027, "CMP0027",
"Conditionally linked imported targets with missing include directories.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0028, "CMP0028",
"Double colon in target name means ALIAS or IMPORTED target.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0029, "CMP0029",
"The subdir_depends command should not be called.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0030, "CMP0030",
"The use_mangled_mesa command should not be called.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0031, "CMP0031",
"The load_command command should not be called.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0032, "CMP0032",
"The output_required_files command should not be called.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0033, "CMP0033",
"The export_library_dependencies command should not be called.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0034, "CMP0034",
"The utility_source command should not be called.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0035, "CMP0035",
"The variable_requires command should not be called.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0036, "CMP0036",
"The build_name command should not be called.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0037, "CMP0037",
"Target names should not be reserved and should match a validity pattern.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0038, "CMP0038",
"Targets may not link directly to themselves.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0039, "CMP0039",
"Utility targets may not have link dependencies.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0040, "CMP0040",
"The target in the TARGET signature of add_custom_command() must exist.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0041, "CMP0041",
"Error on relative include with generator expression.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0042, "CMP0042",
"MACOSX_RPATH is enabled by default.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0043, "CMP0043",
"Ignore COMPILE_DEFINITIONS_<Config> properties.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0044, "CMP0044",
"Case sensitive <LANG>_COMPILER_ID generator expressions.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0045, "CMP0045",
"Error on non-existent target in get_target_property.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0046, "CMP0046",
"Error on non-existent dependency in add_dependencies.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0047, "CMP0047",
"Use QCC compiler id for the qcc drivers on QNX.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0048, "CMP0048",
"project() command manages VERSION variables.",
- 3,0,0,0, cmPolicies::WARN);
+ 3,0,0, cmPolicies::WARN);
}
cmPolicies::~cmPolicies()
@@ -365,7 +352,6 @@ void cmPolicies::DefinePolicy(cmPolicies::PolicyID iD,
unsigned int majorVersionIntroduced,
unsigned int minorVersionIntroduced,
unsigned int patchVersionIntroduced,
- unsigned int tweakVersionIntroduced,
cmPolicies::PolicyStatus status)
{
// a policy must be unique and can only be defined once
@@ -381,7 +367,6 @@ void cmPolicies::DefinePolicy(cmPolicies::PolicyID iD,
majorVersionIntroduced,
minorVersionIntroduced,
patchVersionIntroduced,
- tweakVersionIntroduced,
status);
this->PolicyStringMap[idString] = iD;
}
@@ -451,7 +436,7 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf,
for(std::map<cmPolicies::PolicyID,cmPolicy *>::iterator i
= this->Policies.begin(); i != this->Policies.end(); ++i)
{
- if (i->second->IsPolicyNewerThan(majorVer,minorVer,patchVer,tweakVer))
+ if (i->second->IsPolicyNewerThan(majorVer,minorVer,patchVer))
{
if(i->second->Status == cmPolicies::REQUIRED_ALWAYS)
{
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 42271dd..f9a4768 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -125,7 +125,6 @@ public:
unsigned int majorVersionIntroduced,
unsigned int minorVersionIntroduced,
unsigned int patchVersionIntroduced,
- unsigned int tweakVersionIntroduced,
cmPolicies::PolicyStatus status);
///! Set a policy level for this listfile
-----------------------------------------------------------------------
Summary of changes:
Source/cmPolicies.cxx | 123 ++++++++++++++++++++++---------------------------
Source/cmPolicies.h | 1 -
2 files changed, 54 insertions(+), 70 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list