Browse Source

ENH: put back old style call to SOURCE_GROUP, no need to break things for this

Bill Hoffman 22 years ago
parent
commit
3d27a6a391
2 changed files with 4 additions and 15 deletions
  1. 2 14
      Source/cmSourceGroupCommand.cxx
  2. 2 1
      Source/cmSourceGroupCommand.h

+ 2 - 14
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.

+ 2 - 1
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);