[cmake-commits] alex committed cmInstallExportGenerator.cxx 1.6 1.7 cmInstallCommand.cxx 1.31 1.32

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv3531

Modified Files:
	cmInstallExportGenerator.cxx cmInstallCommand.cxx 
Log Message:

STYLE: rename FILENAME keyword to FILE, because FILENAME is used in no other
place

Alex


Index: cmInstallCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommand.cxx,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- cmInstallCommand.cxx	27 Aug 2007 20:04:57 -0000	1.31
+++ cmInstallCommand.cxx	30 Aug 2007 20:22:01 -0000	1.32
@@ -152,6 +152,15 @@
   return true;
 }
 
+
+/*struct InstallPart
+{
+  InstallPart(cmCommandArgumentsHelper* helper, const char* key, 
+         cmCommandArgumentGroup* group);
+  cmCAStringVector argVector;
+  cmInstallCommandArguments args;
+};*/
+
 //----------------------------------------------------------------------------
 bool cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
 {
@@ -1010,7 +1019,7 @@
   cmInstallCommandArguments ica;
   cmCAStringVector exports(&ica.Parser, "EXPORT");
   cmCAString prefix(&ica.Parser, "PREFIX", &ica.ArgumentGroup);
-  cmCAString filename(&ica.Parser, "FILENAME", &ica.ArgumentGroup);
+  cmCAString filename(&ica.Parser, "FILE", &ica.ArgumentGroup);
   exports.Follows(0);
 
   ica.ArgumentGroup.Follows(&exports);
@@ -1043,6 +1052,9 @@
                           GetExportSet(exportIt->c_str());
     if (exportSet == 0)
       {
+      cmOStringStream e;
+      e << "EXPORT given unknown export name \"" << exportIt->c_str() << "\".";
+      this->SetError(e.str().c_str());
       return false;
       }
 
@@ -1058,6 +1070,9 @@
       }
     else
       {
+      cmOStringStream e;
+      e << "EXPORT failed, maybe a target is exported more than once.";
+      this->SetError(e.str().c_str());
       delete exportGenerator;
       return false;
       }

Index: cmInstallExportGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallExportGenerator.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cmInstallExportGenerator.cxx	27 Aug 2007 20:04:57 -0000	1.6
+++ cmInstallExportGenerator.cxx	30 Aug 2007 20:22:01 -0000	1.7
@@ -154,6 +154,7 @@
       if (targetName == this->Targets[i]->Target->GetName())
         {
         targetWithProps = this->Targets[i];
+        break;
         }
       }