summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-08-15 16:00:27 (GMT)
committerBrad King <brad.king@kitware.com>2006-08-15 16:00:27 (GMT)
commitc6f1a11480f478b430fcb798ddeac972ec17ae6a (patch)
treea9e71d302bcb44201b223dee7528fcfb726662b9 /Source/cmGlobalUnixMakefileGenerator3.cxx
parent7169980b59c16370fa5abec8159afc5cc84a96cd (diff)
downloadCMake-c6f1a11480f478b430fcb798ddeac972ec17ae6a.zip
CMake-c6f1a11480f478b430fcb798ddeac972ec17ae6a.tar.gz
CMake-c6f1a11480f478b430fcb798ddeac972ec17ae6a.tar.bz2
BUG: Added object language to list of object files in a local generator's directory. Fixed generation of preprocessing and assembly rules to be done only for C and C++ objects.
Diffstat (limited to 'Source/cmGlobalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmGlobalUnixMakefileGenerator3.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 4be5cd5..255b1a3 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -1231,9 +1231,10 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
}
}
}
- std::map<cmStdString,std::vector<cmTarget *> > const& objs =
+ typedef cmLocalUnixMakefileGenerator3::LocalObjectInfo LocalObjectInfo;
+ std::map<cmStdString, LocalObjectInfo> const& objs =
lg->GetLocalObjectFiles();
- for(std::map<cmStdString,std::vector<cmTarget *> >::const_iterator o =
+ for(std::map<cmStdString, LocalObjectInfo>::const_iterator o =
objs.begin(); o != objs.end(); ++o)
{
path = "... ";