[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1754-gd480e44
Brad King
brad.king at kitware.com
Wed Apr 2 14:41:34 EDT 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 d480e4491e3b27d646f3af650cdd6b26c9831d91 (commit)
via 9d5a1256ab3f9db0e651ef3e91c6ebc6e3a977f3 (commit)
from 4913ec2e9fc330f4e5bbea32622938328cda8a47 (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=d480e4491e3b27d646f3af650cdd6b26c9831d91
commit d480e4491e3b27d646f3af650cdd6b26c9831d91
Merge: 4913ec2 9d5a125
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 2 14:41:33 2014 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 2 14:41:33 2014 -0400
Merge topic 'revise-compiler-id-policies' into next
9d5a1256 Revert topic 'revise-compiler-id-policies'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d5a1256ab3f9db0e651ef3e91c6ebc6e3a977f3
commit 9d5a1256ab3f9db0e651ef3e91c6ebc6e3a977f3
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 2 14:41:53 2014 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 2 14:42:08 2014 -0400
Revert topic 'revise-compiler-id-policies'
It will be revised and restored.
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 4fac6a5..8b4ce26 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -131,7 +131,6 @@ Variables that Change Behavior
/variable/CMAKE_MODULE_PATH
/variable/CMAKE_NOT_USING_CONFIG_FLAGS
/variable/CMAKE_POLICY_DEFAULT_CMPNNNN
- /variable/CMAKE_POLICY_WARNING_CMPNNNN
/variable/CMAKE_PREFIX_PATH
/variable/CMAKE_PROGRAM_PATH
/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE
diff --git a/Help/policy/CMP0025.rst b/Help/policy/CMP0025.rst
index 8d19edf..f3b39e3 100644
--- a/Help/policy/CMP0025.rst
+++ b/Help/policy/CMP0025.rst
@@ -1,27 +1,21 @@
CMP0025
-------
-Compiler id for Apple Clang is now ``AppleClang``.
+Compiler id for Apple Clang is now AppleClang.
-CMake 3.0 and above recognize that Apple Clang is a different compiler
+CMake >= 3.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 the
-:variable:`CMAKE_<LANG>_COMPILER_ID` variable to ``AppleClang`` instead
-of ``Clang``. However, existing projects may assume the compiler id for
-Apple Clang is just ``Clang`` as it was in CMake versions prior to 3.0.
-Therefore this policy determines for Apple Clang which compiler id to
-report in the :variable:`CMAKE_<LANG>_COMPILER_ID` variable after
-language ``<LANG>`` is enabled by the :command:`project` or
-:command:`enable_language` command. The policy must be set prior
-to the invocation of either command.
+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 < 3.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.
-The OLD behavior for this policy is to use compiler id ``Clang``. The
-NEW behavior for this policy is to use compiler id ``AppleClang``.
+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 3.0. Use the
-:command:`cmake_policy` command to set this policy to OLD or NEW explicitly.
-Unlike most policies, CMake version |release| does *not* warn
-by default when this policy is not set and simply uses OLD behavior.
-See documentation of the
-:variable:`CMAKE_POLICY_WARNING_CMP0025 <CMAKE_POLICY_WARNING_CMP<NNNN>>`
-variable to control the warning.
+This policy was introduced in CMake version 3.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.
diff --git a/Help/policy/CMP0047.rst b/Help/policy/CMP0047.rst
index 26ae439..c2d951b 100644
--- a/Help/policy/CMP0047.rst
+++ b/Help/policy/CMP0047.rst
@@ -1,28 +1,16 @@
CMP0047
-------
-Use ``QCC`` compiler id for the qcc drivers on QNX.
+Use QCC compiler id for the qcc drivers on QNX.
-CMake 3.0 and above recognize that the QNX qcc compiler driver is
-different from the GNU compiler.
-CMake now prefers to present this to projects by setting the
-:variable:`CMAKE_<LANG>_COMPILER_ID` variable to ``QCC`` instead
-of ``GNU``. However, existing projects may assume the compiler id for
-QNX qcc is just ``GNU`` as it was in CMake versions prior to 3.0.
-Therefore this policy determines for QNX qcc which compiler id to
-report in the :variable:`CMAKE_<LANG>_COMPILER_ID` variable after
-language ``<LANG>`` is enabled by the :command:`project` or
-:command:`enable_language` command. The policy must be set prior
-to the invocation of either command.
+CMake 2.8.12 and lower assigned the QNX qcc and QCC compiler drivers the "GNU"
+compiler id.
-The OLD behavior for this policy is to use the ``GNU`` compiler id
-for the qcc and QCC compiler drivers. The NEW behavior for this policy
-is to use the ``QCC`` compiler id for those drivers.
+The OLD behavior for this policy is to use the "GNU" compiler id for the qcc
+and QCC compiler drivers. The NEW behavior for this policy is to use the "QCC"
+compiler id for those drivers.
-This policy was introduced in CMake version 3.0. Use the
-:command:`cmake_policy` command to set this policy to OLD or NEW explicitly.
-Unlike most policies, CMake version |release| does *not* warn
-by default when this policy is not set and simply uses OLD behavior.
-See documentation of the
-:variable:`CMAKE_POLICY_WARNING_CMP0047 <CMAKE_POLICY_WARNING_CMP<NNNN>>`
-variable to control the warning.
+This policy was introduced in CMake version 3.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.
diff --git a/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst b/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
deleted file mode 100644
index 159098c..0000000
--- a/Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
+++ /dev/null
@@ -1,17 +0,0 @@
-CMAKE_POLICY_WARNING_CMP<NNNN>
-------------------------------
-
-Explicitly enable or disable the warning when CMake Policy ``CMP<NNNN>``
-is not set. This is meaningful only for the few policies that do not
-warn by default:
-
-* ``CMAKE_POLICY_WARNING_CMP0025`` controls the warning for
- policy :policy:`CMP0025`.
-* ``CMAKE_POLICY_WARNING_CMP0047`` controls the warning for
- policy :policy:`CMP0047`.
-
-This variable should not be set by a project in CMake code. Project
-developers running CMake may set this variable in their cache to
-enable the warning (e.g. ``-DCMAKE_POLICY_WARNING_CMP<NNNN>=ON``).
-Alternatively, running :manual:`cmake(1)` with the ``--debug-output``,
-``--trace``, or ``-Wdev`` option will also enable the warning.
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 3d291f4..5b6d729 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -765,8 +765,7 @@ void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf,
switch(mf->GetPolicyStatus(cmPolicies::CMP0025))
{
case cmPolicies::WARN:
- if(!this->CMakeInstance->GetIsInTryCompile() &&
- mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0025"))
+ if(!this->CMakeInstance->GetIsInTryCompile())
{
cmOStringStream w;
w << policies->GetPolicyWarning(cmPolicies::CMP0025) << "\n"
@@ -797,8 +796,7 @@ void cmGlobalGenerator::CheckCompilerIdCompatibility(cmMakefile* mf,
switch(mf->GetPolicyStatus(cmPolicies::CMP0047))
{
case cmPolicies::WARN:
- if(!this->CMakeInstance->GetIsInTryCompile() &&
- mf->PolicyOptionalWarningEnabled("CMAKE_POLICY_WARNING_CMP0047"))
+ if(!this->CMakeInstance->GetIsInTryCompile())
{
cmOStringStream w;
w << policies->GetPolicyWarning(cmPolicies::CMP0047) << "\n"
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 12da1f0..2757564 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4330,30 +4330,6 @@ cmMakefile::GetPolicyStatusInternal(cmPolicies::PolicyID id) const
return this->GetPolicies()->GetPolicyStatus(id);
}
-//----------------------------------------------------------------------------
-bool cmMakefile::PolicyOptionalWarningEnabled(std::string const& var)
-{
- // Check for an explicit CMAKE_POLICY_WARNING_CMP<NNNN> setting.
- if(!var.empty())
- {
- if(const char* val = this->GetDefinition(var))
- {
- return cmSystemTools::IsOn(val);
- }
- }
- // Enable optional policy warnings with --debug-output or --trace.
- cmake* cm = this->GetCMakeInstance();
- if(cm->GetDebugOutput() || cm->GetTrace())
- {
- return true;
- }
-
- // Enable optional policy warnings with explicit -Wdev.
- cmCacheManager::CacheIterator it = cm->GetCacheManager()
- ->GetCacheIterator("CMAKE_SUPPRESS_DEVELOPER_WARNINGS");
- return !it.IsAtEnd() && !it.GetValueAsBool();
-}
-
bool cmMakefile::SetPolicy(const char *id,
cmPolicies::PolicyStatus status)
{
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 8ff6daa..460a85c 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -880,8 +880,6 @@ public:
std::set<std::string> const & GetSystemIncludeDirectories() const
{ return this->SystemIncludeDirectories; }
- bool PolicyOptionalWarningEnabled(std::string const& var);
-
protected:
// add link libraries and directories to the target
void AddGlobalLinkInformation(const std::string& name, cmTarget& target);
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-variables.7.rst | 1 -
Help/policy/CMP0025.rst | 34 ++++++++++--------------
Help/policy/CMP0047.rst | 32 +++++++---------------
Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst | 17 ------------
Source/cmGlobalGenerator.cxx | 6 ++---
Source/cmMakefile.cxx | 24 -----------------
Source/cmMakefile.h | 2 --
7 files changed, 26 insertions(+), 90 deletions(-)
delete mode 100644 Help/variable/CMAKE_POLICY_WARNING_CMPNNNN.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list