summaryrefslogtreecommitdiff
path: root/Source/cmFileCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-02-24 15:14:08 -0500
committerBrad King <brad.king@kitware.com>2011-02-24 15:14:08 -0500
commitc3e452e944f915975d13d89023cd43ed3dba5221 (patch)
treea12ae00856e6f1e5fbcd882c0a3089a743a2216d /Source/cmFileCommand.cxx
parenta9841e6e9aae1f2df0e3d94031dc3816c269d4b5 (diff)
downloadcmake-c3e452e944f915975d13d89023cd43ed3dba5221.tar.gz
Require at least CMake 2.6.3 to build current CMake
Remove some cruft left for supporting builds with CMake 2.4.
Diffstat (limited to 'Source/cmFileCommand.cxx')
-rw-r--r--Source/cmFileCommand.cxx30
1 files changed, 7 insertions, 23 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index 37fced2db7..131661de33 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -1707,7 +1707,7 @@ protected:
{
DoingType = DoingLast1,
DoingRename,
- DoingSelf24
+ DoingLast2
};
virtual bool CheckKeyword(std::string const& arg);
virtual bool CheckValue(std::string const& arg);
@@ -1846,22 +1846,12 @@ bool cmFileInstaller::CheckKeyword(std::string const& arg)
else if(arg == "COMPONENTS" || arg == "CONFIGURATIONS" ||
arg == "PROPERTIES")
{
- if(this->Makefile->IsOn("CMAKE_INSTALL_SELF_2_4"))
- {
- // When CMake 2.4 builds this CMake version we need to support
- // the install scripts it generates since it asks this CMake
- // to install itself using the rules it generated.
- this->Doing = DoingSelf24;
- }
- else
- {
- cmOStringStream e;
- e << "INSTALL called with old-style " << arg << " argument. "
- << "This script was generated with an older version of CMake. "
- << "Re-run this cmake version on your build tree.";
- this->FileCommand->SetError(e.str().c_str());
- this->Doing = DoingError;
- }
+ cmOStringStream e;
+ e << "INSTALL called with old-style " << arg << " argument. "
+ << "This script was generated with an older version of CMake. "
+ << "Re-run this cmake version on your build tree.";
+ this->FileCommand->SetError(e.str().c_str());
+ this->Doing = DoingError;
}
else
{
@@ -1884,12 +1874,6 @@ bool cmFileInstaller::CheckValue(std::string const& arg)
case DoingRename:
this->Rename = arg;
break;
- case DoingSelf24:
- // Ignore these arguments for compatibility. This should be
- // reached only when CMake 2.4 is installing the current
- // CMake. It can be removed when CMake 2.6 or higher is
- // required to build CMake.
- break;
default:
return this->cmFileCopier::CheckValue(arg);
}