diff options
author | Ken Martin <ken.martin@kitware.com> | 2008-03-05 16:41:25 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2008-03-05 16:41:25 (GMT) |
commit | f2c6e9e4809c9a85293bd9d01183c99c4598c403 (patch) | |
tree | d81943651ce0baea6912f13893817c28a9df3143 /Source/cmPolicies.cxx | |
parent | 7173f2db0e37a1621236b3ceeb883d4f1255ee42 (diff) | |
download | CMake-f2c6e9e4809c9a85293bd9d01183c99c4598c403.zip CMake-f2c6e9e4809c9a85293bd9d01183c99c4598c403.tar.gz CMake-f2c6e9e4809c9a85293bd9d01183c99c4598c403.tar.bz2 |
BUG: some fixes, still a few to go
Diffstat (limited to 'Source/cmPolicies.cxx')
-rw-r--r-- | Source/cmPolicies.cxx | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx index b7e07e1..77d903f 100644 --- a/Source/cmPolicies.cxx +++ b/Source/cmPolicies.cxx @@ -112,7 +112,17 @@ cmPolicies::cmPolicies() 2,6,0, cmPolicies::WARN); this->PolicyStringMap["CMP_REQUIRE_UNIQUE_TARGET_NAMES"] = CMP_0002; -} + this->DefinePolicy(CMP_0003, "CMP_0003", + "CMake configures file immediately after 2.0.", + "In CMake 2.0 and earlier the configure_file command would not " + "configure the file until after processing all CMakeLists files. " + "In CMake 2.2 and later the default behavior is that it will " + "configure the file right when the command is invoked." + , + 2,2,0, cmPolicies::NEW); + this->PolicyStringMap["CMP_CONFIGURE_FILE_IMMEDIATE"] = CMP_0003; + + } cmPolicies::~cmPolicies() { @@ -188,7 +198,8 @@ bool cmPolicies::ApplyPolicyVersion(cmMakefile *mf, // add in the old CMAKE_BACKWARDS_COMPATIBILITY var for old CMake compatibility if ((majorVer == 2 && minorVer <= 4) || majorVer < 2) { - if (!mf->GetCacheManager()->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY")) + if (!mf->GetCacheManager()-> + GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY")) { mf->AddCacheDefinition ("CMAKE_BACKWARDS_COMPATIBILITY",version, |