summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2003-07-28 18:43:04 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2003-07-28 18:43:04 (GMT)
commit3d27a6a39114aa97422fb3a431262a35a6dc113d (patch)
tree3a036b11b26d71d2be366214d5c959430b076ebe
parentf7c9e258aee90eb372825d5ab89057935383e23b (diff)
downloadCMake-3d27a6a39114aa97422fb3a431262a35a6dc113d.zip
CMake-3d27a6a39114aa97422fb3a431262a35a6dc113d.tar.gz
CMake-3d27a6a39114aa97422fb3a431262a35a6dc113d.tar.bz2
ENH: put back old style call to SOURCE_GROUP, no need to break things for this
-rw-r--r--Source/cmSourceGroupCommand.cxx16
-rw-r--r--Source/cmSourceGroupCommand.h3
2 files changed, 4 insertions, 15 deletions
diff --git a/Source/cmSourceGroupCommand.cxx b/Source/cmSourceGroupCommand.cxx
index e863946..131e86c 100644
--- a/Source/cmSourceGroupCommand.cxx
+++ b/Source/cmSourceGroupCommand.cxx
@@ -37,20 +37,8 @@ bool cmSourceGroupCommand::InitialPass(std::vector<std::string> const& args)
// command is being invoked.
if(args.size() == 2 && args[1] != "FILES")
{
- const char* versionValue =
- m_Makefile->GetDefinition("CMAKE_BACKWARDS_COMPATIBILITY");
- if(atof(versionValue) > 1.6)
- {
- this->SetError("no longer accepts a two-argument form. Use the "
- "REGULAR_EXPRESSION argument form instead, or set "
- "CMAKE_BACKWARDS_COMPATIBILITY to 1.6 or less.\n");
- return false;
- }
- else
- {
- sg->SetGroupRegex(args[1].c_str());
- return true;
- }
+ sg->SetGroupRegex(args[1].c_str());
+ return true;
}
// Process arguments.
diff --git a/Source/cmSourceGroupCommand.h b/Source/cmSourceGroupCommand.h
index 1dc1ba3..a7c87c5 100644
--- a/Source/cmSourceGroupCommand.h
+++ b/Source/cmSourceGroupCommand.h
@@ -78,7 +78,8 @@ public:
"be placed in this group. If a file matches multiple groups, the LAST "
"group that explicitly lists the file will be favored, if any. If no "
"group explicitly lists the file, the LAST group whose regular "
- "expression matches the file will be favored.";
+ "expression matches the file will be favored. For backwards compatibility,"
+ "this command is also supports the format SOURCE_GROUP(name regex).";
}
cmTypeMacro(cmSourceGroupCommand, cmCommand);