[cmake-commits] hoffman committed cmMakefileTargetGenerator.cxx 1.42
1.43
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Sep 12 10:03:59 EDT 2006
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv6972/Source
Modified Files:
cmMakefileTargetGenerator.cxx
Log Message:
ENH: fix for BUG: #739 again, makefiles did not depend on external full path libraries
Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- cmMakefileTargetGenerator.cxx 8 Sep 2006 14:42:14 -0000 1.42
+++ cmMakefileTargetGenerator.cxx 12 Sep 2006 14:03:57 -0000 1.43
@@ -1113,7 +1113,7 @@
// Don't emit the same library twice for this target.
if(emitted.insert(lib->first).second)
{
- // Depend only on other CMake targets.
+ // Depend on other CMake targets.
if(cmTarget* tgt =
this->GlobalGenerator->FindTarget(0, lib->first.c_str()))
{
@@ -1124,6 +1124,11 @@
}
}
}
+ // depend on full path libs as well
+ else if(cmSystemTools::FileIsFullPath(lib->first.c_str()))
+ {
+ depends.push_back(lib->first.c_str());
+ }
}
}
More information about the Cmake-commits
mailing list