[cmake-commits] alex committed cmLocalGenerator.cxx 1.224 1.225 cmLocalVisualStudio6Generator.cxx 1.125 1.126 cmLocalVisualStudio7Generator.cxx 1.192 1.193 cmTarget.cxx 1.145 1.146

[cmake-commits at cmake.org]

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

Modified Files:
	cmLocalGenerator.cxx cmLocalVisualStudio6Generator.cxx 
	cmLocalVisualStudio7Generator.cxx cmTarget.cxx 
Log Message:

BUG: don't use non-imported target when cross compiling as commands in custom commands
STYLE: remove now invalid comments, use this->

Alex


Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- cmLocalVisualStudio7Generator.cxx	23 May 2007 19:40:12 -0000	1.192
+++ cmLocalVisualStudio7Generator.cxx	24 May 2007 12:43:31 -0000	1.193
@@ -113,7 +113,6 @@
 
   // Create the VCProj or set of VCProj's for libraries and executables
 
-  // Call TraceVSDependencies on all targets
   cmTargets &tgts = this->Makefile->GetTargets();
   for(cmTargets::iterator l = tgts.begin();
       l != tgts.end(); l++)

Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- cmLocalVisualStudio6Generator.cxx	23 May 2007 19:40:12 -0000	1.125
+++ cmLocalVisualStudio6Generator.cxx	24 May 2007 12:43:31 -0000	1.126
@@ -106,7 +106,6 @@
 
   // clear project names
   this->CreatedProjectNames.clear();
-  // Call TraceVSDependencies on all targets
   cmTargets &tgts = this->Makefile->GetTargets(); 
   for(cmTargets::iterator l = tgts.begin(); 
       l != tgts.end(); l++)

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- cmTarget.cxx	23 May 2007 19:40:12 -0000	1.145
+++ cmTarget.cxx	24 May 2007 12:43:31 -0000	1.146
@@ -547,9 +547,9 @@
       }
     }
 
-  CheckForTargetsAsCommand(this->GetPreBuildCommands());
-  CheckForTargetsAsCommand(this->GetPreLinkCommands());
-  CheckForTargetsAsCommand(this->GetPostBuildCommands());
+  this->CheckForTargetsAsCommand(this->GetPreBuildCommands());
+  this->CheckForTargetsAsCommand(this->GetPreLinkCommands());
+  this->CheckForTargetsAsCommand(this->GetPostBuildCommands());
 
   while (!srcFilesToProcess.empty())
     {

Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -d -r1.224 -r1.225
--- cmLocalGenerator.cxx	23 May 2007 22:23:17 -0000	1.224
+++ cmLocalGenerator.cxx	24 May 2007 12:43:31 -0000	1.225
@@ -2024,9 +2024,13 @@
                                               const char* config)
 {
   std::string outName=inName;
-  // Look for a CMake target with the given name.
+  // Look for a CMake target with the given name, which is an executable 
+  // and which can be run
   cmTarget* target = this->GlobalGenerator->FindTarget(0, inName, true);
-  if ((target != 0) && (target->GetType() == cmTarget::EXECUTABLE))
+  if ((target != 0)
+       && (target->GetType() == cmTarget::EXECUTABLE)
+       && ((this->Makefile->IsOn("CMAKE_CROSSCOMPILING") == false) 
+            || (target->IsImported() == true)))
     {
     outName = target->GetLocation( config );
     }