kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-policy-versions' 

1873205 Update CMP0024/CMP0025/CMP0026 release version
This commit is contained in:
Brad King 2013-10-18 10:02:44 -04:00 committed by CMake Topic Stage
parent abf0dc7fd3 1873205a6e
commit de5159236d
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Help/policy/CMP0024.rst
View File

@ -17,6 +17,6 @@ The OLD behavior for this policy is to allow including the result of
an export() command. The NEW behavior for this policy is to not to
allow including the result of an export() command.
This policy was introduced in CMake version 2.8.13. CMake version
This policy was introduced in CMake version 3.0.0. CMake version
|release| warns when the policy is not set and uses OLD behavior. Use
the cmake_policy command to set it to OLD or NEW explicitly.

6
Help/policy/CMP0025.rst
View File

@ -3,12 +3,12 @@ CMP0025
Compiler id for Apple Clang is now AppleClang.
CMake >= 2.8.13 recognize that Apple Clang is a different compiler
CMake >= 3.0.0 recognize that Apple Clang is a different compiler
than upstream Clang and that they have different version numbers.
CMake now prefers to present this to projects by setting
CMAKE_<LANG>_COMPILER_ID to "AppleClang" instead of "Clang". However,
existing projects may assume the compiler id for Apple Clang is just
"Clang" as it was in CMake < 2.8.13. Therefore this policy determines
"Clang" as it was in CMake < 3.0.0. Therefore this policy determines
for Apple Clang which compiler id to report in
CMAKE_<LANG>_COMPILER_ID after <LANG> is enabled by the project() or
enable_language() command.
@ -16,6 +16,6 @@ enable_language() command.
The OLD behavior for this policy is to use compiler id "Clang". The
NEW behavior for this policy is to use compiler id "AppleClang".
This policy was introduced in CMake version 2.8.13. CMake version
This policy was introduced in CMake version 3.0.0. CMake version
|release| warns when the policy is not set and uses OLD behavior. Use
the cmake_policy command to set it to OLD or NEW explicitly.

2
Help/policy/CMP0026.rst
View File

@ -20,6 +20,6 @@ The OLD behavior for this policy is to allow reading the LOCATION
property from build-targets. The NEW behavior for this policy is to
not to allow reading the LOCATION property from build-targets.
This policy was introduced in CMake version 2.8.13. CMake version
This policy was introduced in CMake version 3.0.0. CMake version
|release| warns when the policy is not set and uses OLD behavior. Use
the cmake_policy command to set it to OLD or NEW explicitly.

6
Source/cmPolicies.cxx
View File

@ -225,17 +225,17 @@ cmPolicies::cmPolicies()
this->DefinePolicy(
CMP0024, "CMP0024",
"Disallow include export result.",
2,8,13,0, cmPolicies::WARN);
3,0,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0025, "CMP0025",
"Compiler id for Apple Clang is now AppleClang.",
2,8,13,0, cmPolicies::WARN);
3,0,0,0, cmPolicies::WARN);
this->DefinePolicy(
CMP0026, "CMP0026",
"Disallow use of the LOCATION target property.",
2,8,13,0, cmPolicies::WARN);
3,0,0,0, cmPolicies::WARN);
}
cmPolicies::~cmPolicies()