[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1243-gb0e04b3
Brad King
brad.king at kitware.com
Fri Dec 7 09:53:54 EST 2012
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 b0e04b33e8e46e20dbbd04c4fc6b378717e6f904 (commit)
via f3953103f6f91d5bf1359f1eb0162ad26a1ab2dc (commit)
from d02456cb18822f74e2c67e7e080ffdff486e815b (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=b0e04b33e8e46e20dbbd04c4fc6b378717e6f904
commit b0e04b33e8e46e20dbbd04c4fc6b378717e6f904
Merge: d02456c f395310
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 7 09:53:52 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 7 09:53:52 2012 -0500
Merge topic 'skip-variable-re-expansion' into next
f395310 Rename CMP0021 to CMP0019 and drop reserved spots in between
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f3953103f6f91d5bf1359f1eb0162ad26a1ab2dc
commit f3953103f6f91d5bf1359f1eb0162ad26a1ab2dc
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 7 09:49:15 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 7 09:50:19 2012 -0500
Rename CMP0021 to CMP0019 and drop reserved spots in between
The other policies under development using CMP0019 and CMP0020 will be
renumbered and added later. They may not be in 2.8.11 so it is simplest
to avoid confusion by not skipping any policy numbers.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2552689..d943c45 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -814,7 +814,7 @@ bool cmMakefile::NeedBackwardsCompatibility(unsigned int major,
void cmMakefile::FinalPass()
{
// do all the variable expansions here
- this->ExpandVariablesCMP0021();
+ this->ExpandVariablesCMP0019();
// give all the commands a chance to do something
// after the file has been parsed before generation
@@ -2122,15 +2122,15 @@ void cmMakefile::AddExtraDirectory(const char* dir)
this->AuxSourceDirectories.push_back(dir);
}
-static bool mightExpandVariablesCMP0021(const char* s)
+static bool mightExpandVariablesCMP0019(const char* s)
{
return s && *s && strstr(s,"${") && strchr(s,'}');
}
-void cmMakefile::ExpandVariablesCMP0021()
+void cmMakefile::ExpandVariablesCMP0019()
{
// Drop this ancient compatibility behavior with a policy.
- cmPolicies::PolicyStatus pol = this->GetPolicyStatus(cmPolicies::CMP0021);
+ cmPolicies::PolicyStatus pol = this->GetPolicyStatus(cmPolicies::CMP0019);
if(pol != cmPolicies::OLD && pol != cmPolicies::WARN)
{
return;
@@ -2138,7 +2138,7 @@ void cmMakefile::ExpandVariablesCMP0021()
cmOStringStream w;
const char *includeDirs = this->GetProperty("INCLUDE_DIRECTORIES");
- if(mightExpandVariablesCMP0021(includeDirs))
+ if(mightExpandVariablesCMP0019(includeDirs))
{
std::string dirs = includeDirs;
this->ExpandVariablesInString(dirs, true, true);
@@ -2158,7 +2158,7 @@ void cmMakefile::ExpandVariablesCMP0021()
{
cmTarget &t = l->second;
includeDirs = t.GetProperty("INCLUDE_DIRECTORIES");
- if(mightExpandVariablesCMP0021(includeDirs))
+ if(mightExpandVariablesCMP0019(includeDirs))
{
std::string dirs = includeDirs;
this->ExpandVariablesInString(dirs, true, true);
@@ -2176,7 +2176,7 @@ void cmMakefile::ExpandVariablesCMP0021()
for(std::vector<std::string>::iterator d = this->LinkDirectories.begin();
d != this->LinkDirectories.end(); ++d)
{
- if(mightExpandVariablesCMP0021(d->c_str()))
+ if(mightExpandVariablesCMP0019(d->c_str()))
{
std::string orig = *d;
this->ExpandVariablesInString(*d, true, true);
@@ -2193,7 +2193,7 @@ void cmMakefile::ExpandVariablesCMP0021()
this->LinkLibraries.begin();
l != this->LinkLibraries.end(); ++l)
{
- if(mightExpandVariablesCMP0021(l->first.c_str()))
+ if(mightExpandVariablesCMP0019(l->first.c_str()))
{
std::string orig = l->first;
this->ExpandVariablesInString(l->first, true, true);
@@ -2210,7 +2210,7 @@ void cmMakefile::ExpandVariablesCMP0021()
if(!w.str().empty())
{
cmOStringStream m;
- m << this->GetPolicies()->GetPolicyWarning(cmPolicies::CMP0021)
+ m << this->GetPolicies()->GetPolicyWarning(cmPolicies::CMP0019)
<< "\n"
<< "The following variable evaluations were encountered:\n"
<< w.str();
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 96a3d59..eff05d0 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -693,7 +693,7 @@ public:
/**
* Expand variables in the makefiles ivars such as link directories etc
*/
- void ExpandVariablesCMP0021();
+ void ExpandVariablesCMP0019();
/**
* Replace variables and #cmakedefine lines in the given string.
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index c16acc8..eb7d666 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -493,7 +493,7 @@ cmPolicies::cmPolicies()
2,8,9,0, cmPolicies::WARN);
this->DefinePolicy(
- CMP0021, "CMP0021",
+ CMP0019, "CMP0019",
"Do not re-expand variables in include and link information.",
"CMake 2.8.10 and lower re-evaluated values given to the "
"include_directories, link_directories, and link_libraries "
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 9180b26..d7d945c 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -68,9 +68,7 @@ public:
CMP0018, ///< Ignore language flags for shared libs, and adhere to
/// POSITION_INDEPENDENT_CODE property and *_COMPILE_OPTIONS_PI{E,C}
/// instead.
- CMP0019, ///< Reserved.
- CMP0020, ///< Reserved.
- CMP0021, ///< No variable re-expansion in include and link info
+ CMP0019, ///< No variable re-expansion in include and link info
/** \brief Always the last entry.
*
diff --git a/Tests/RunCMake/CMP0019/CMP0019-NEW.cmake b/Tests/RunCMake/CMP0019/CMP0019-NEW.cmake
new file mode 100644
index 0000000..3091e66
--- /dev/null
+++ b/Tests/RunCMake/CMP0019/CMP0019-NEW.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0019 NEW)
+include(CMP0019-code.cmake)
diff --git a/Tests/RunCMake/CMP0019/CMP0019-OLD.cmake b/Tests/RunCMake/CMP0019/CMP0019-OLD.cmake
new file mode 100644
index 0000000..0f02f9c
--- /dev/null
+++ b/Tests/RunCMake/CMP0019/CMP0019-OLD.cmake
@@ -0,0 +1,2 @@
+cmake_policy(SET CMP0019 OLD)
+include(CMP0019-code.cmake)
diff --git a/Tests/RunCMake/CMP0021/CMP0021-WARN-stderr.txt b/Tests/RunCMake/CMP0019/CMP0019-WARN-stderr.txt
similarity index 85%
rename from Tests/RunCMake/CMP0021/CMP0021-WARN-stderr.txt
rename to Tests/RunCMake/CMP0019/CMP0019-WARN-stderr.txt
index b95deb9..03faef9 100644
--- a/Tests/RunCMake/CMP0021/CMP0021-WARN-stderr.txt
+++ b/Tests/RunCMake/CMP0019/CMP0019-WARN-stderr.txt
@@ -1,6 +1,6 @@
CMake Warning \(dev\) in CMakeLists.txt:
- Policy CMP0021 is not set: Do not re-expand variables in include and link
- information. Run "cmake --help-policy CMP0021" for policy details. Use
+ Policy CMP0019 is not set: Do not re-expand variables in include and link
+ information. Run "cmake --help-policy CMP0019" for policy details. Use
the cmake_policy command to set the policy and suppress this warning.
The following variable evaluations were encountered:
diff --git a/Tests/RunCMake/CMP0019/CMP0019-WARN.cmake b/Tests/RunCMake/CMP0019/CMP0019-WARN.cmake
new file mode 100644
index 0000000..a419f30
--- /dev/null
+++ b/Tests/RunCMake/CMP0019/CMP0019-WARN.cmake
@@ -0,0 +1 @@
+include(CMP0019-code.cmake)
diff --git a/Tests/RunCMake/CMP0021/CMP0021-code.cmake b/Tests/RunCMake/CMP0019/CMP0019-code.cmake
similarity index 100%
rename from Tests/RunCMake/CMP0021/CMP0021-code.cmake
rename to Tests/RunCMake/CMP0019/CMP0019-code.cmake
diff --git a/Tests/RunCMake/CMP0021/CMakeLists.txt b/Tests/RunCMake/CMP0019/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CMP0021/CMakeLists.txt
rename to Tests/RunCMake/CMP0019/CMakeLists.txt
diff --git a/Tests/RunCMake/CMP0019/RunCMakeTest.cmake b/Tests/RunCMake/CMP0019/RunCMakeTest.cmake
new file mode 100644
index 0000000..119fc2b
--- /dev/null
+++ b/Tests/RunCMake/CMP0019/RunCMakeTest.cmake
@@ -0,0 +1,5 @@
+include(RunCMake)
+
+run_cmake(CMP0019-WARN)
+run_cmake(CMP0019-OLD)
+run_cmake(CMP0019-NEW)
diff --git a/Tests/RunCMake/CMP0021/CMP0021-NEW.cmake b/Tests/RunCMake/CMP0021/CMP0021-NEW.cmake
deleted file mode 100644
index e2d6546..0000000
--- a/Tests/RunCMake/CMP0021/CMP0021-NEW.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-cmake_policy(SET CMP0021 NEW)
-include(CMP0021-code.cmake)
diff --git a/Tests/RunCMake/CMP0021/CMP0021-OLD.cmake b/Tests/RunCMake/CMP0021/CMP0021-OLD.cmake
deleted file mode 100644
index 67eca3f..0000000
--- a/Tests/RunCMake/CMP0021/CMP0021-OLD.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-cmake_policy(SET CMP0021 OLD)
-include(CMP0021-code.cmake)
diff --git a/Tests/RunCMake/CMP0021/CMP0021-WARN.cmake b/Tests/RunCMake/CMP0021/CMP0021-WARN.cmake
deleted file mode 100644
index 941e7d1..0000000
--- a/Tests/RunCMake/CMP0021/CMP0021-WARN.cmake
+++ /dev/null
@@ -1 +0,0 @@
-include(CMP0021-code.cmake)
diff --git a/Tests/RunCMake/CMP0021/RunCMakeTest.cmake b/Tests/RunCMake/CMP0021/RunCMakeTest.cmake
deleted file mode 100644
index d777782..0000000
--- a/Tests/RunCMake/CMP0021/RunCMakeTest.cmake
+++ /dev/null
@@ -1,5 +0,0 @@
-include(RunCMake)
-
-run_cmake(CMP0021-WARN)
-run_cmake(CMP0021-OLD)
-run_cmake(CMP0021-NEW)
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 26719a1..cc544a3 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -45,7 +45,7 @@ macro(add_RunCMake_test test)
)
endmacro()
-add_RunCMake_test(CMP0021)
+add_RunCMake_test(CMP0019)
add_RunCMake_test(GeneratorExpression)
add_RunCMake_test(TargetPropertyGeneratorExpressions)
add_RunCMake_test(Languages)
-----------------------------------------------------------------------
Summary of changes:
Source/cmMakefile.cxx | 18 +++++++++---------
Source/cmMakefile.h | 2 +-
Source/cmPolicies.cxx | 2 +-
Source/cmPolicies.h | 4 +---
Tests/RunCMake/CMP0019/CMP0019-NEW.cmake | 2 ++
Tests/RunCMake/CMP0019/CMP0019-OLD.cmake | 2 ++
.../CMP0019-WARN-stderr.txt} | 4 ++--
Tests/RunCMake/CMP0019/CMP0019-WARN.cmake | 1 +
.../CMP0019-code.cmake} | 0
Tests/RunCMake/{CMP0021 => CMP0019}/CMakeLists.txt | 0
Tests/RunCMake/CMP0019/RunCMakeTest.cmake | 5 +++++
Tests/RunCMake/CMP0021/CMP0021-NEW.cmake | 2 --
Tests/RunCMake/CMP0021/CMP0021-OLD.cmake | 2 --
Tests/RunCMake/CMP0021/CMP0021-WARN.cmake | 1 -
Tests/RunCMake/CMP0021/RunCMakeTest.cmake | 5 -----
Tests/RunCMake/CMakeLists.txt | 2 +-
16 files changed, 25 insertions(+), 27 deletions(-)
create mode 100644 Tests/RunCMake/CMP0019/CMP0019-NEW.cmake
create mode 100644 Tests/RunCMake/CMP0019/CMP0019-OLD.cmake
rename Tests/RunCMake/{CMP0021/CMP0021-WARN-stderr.txt => CMP0019/CMP0019-WARN-stderr.txt} (85%)
create mode 100644 Tests/RunCMake/CMP0019/CMP0019-WARN.cmake
rename Tests/RunCMake/{CMP0021/CMP0021-code.cmake => CMP0019/CMP0019-code.cmake} (100%)
rename Tests/RunCMake/{CMP0021 => CMP0019}/CMakeLists.txt (100%)
create mode 100644 Tests/RunCMake/CMP0019/RunCMakeTest.cmake
delete mode 100644 Tests/RunCMake/CMP0021/CMP0021-NEW.cmake
delete mode 100644 Tests/RunCMake/CMP0021/CMP0021-OLD.cmake
delete mode 100644 Tests/RunCMake/CMP0021/CMP0021-WARN.cmake
delete mode 100644 Tests/RunCMake/CMP0021/RunCMakeTest.cmake
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list