mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-06 05:40:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

ENH: some changes to the depends signature to be more flexible

Browse Source
This commit is contained in:
Ken Martin
2005-05-11 13:16:45 -04:00
parent 25d6c04add
commit c85069b290
9 changed files with 61 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmLocalUnixMakefileGenerator2.cxx
View File

@@ -3102,21 +3102,27 @@ cmLocalUnixMakefileGenerator2::GetDependsChecker(const std::string& lang,
const char* objFile,
bool verbose)
{
cmDepends *ret = 0;
if(lang == "C" || lang == "CXX" || lang == "RC")
{
return new cmDependsC(dir, objFile, verbose);
ret = new cmDependsC();
}
#ifdef CMAKE_BUILD_WITH_CMAKE
else if(lang == "Fortran")
{
return new cmDependsFortran(dir, objFile, verbose);
ret = new cmDependsFortran();
}
else if(lang == "Java")
{
return new cmDependsJava(dir, objFile, verbose);
ret = new cmDependsJava();
}
#endif
return 0;
if (ret)
{
ret->SetTargetFile(dir, objFile, ".depends",".depends.make");
ret->SetVerbose(verbose);
}
return ret;
}
//----------------------------------------------------------------------------
@@ -3201,19 +3207,22 @@ cmLocalUnixMakefileGenerator2
if(lang == "C" || lang == "CXX" || lang == "RC")
{
// TODO: Handle RC (resource files) dependencies correctly.
cmDependsC scanner(".", objFile, srcFile, includes,
cmDependsC scanner(srcFile, includes,
includeRegexScan.c_str(), includeRegexComplain.c_str());
scanner.SetTargetFile(".",objFile,".depends",".depends.make");
return scanner.Write();
}
#ifdef CMAKE_BUILD_WITH_CMAKE
else if(lang == "Fortran")
{
cmDependsFortran scanner(".", objFile, srcFile, includes);
cmDependsFortran scanner(srcFile, includes);
scanner.SetTargetFile(".",objFile,".depends",".depends.make");
return scanner.Write();
}
else if(lang == "Java")
{
cmDependsJava scanner(".", objFile, srcFile);
cmDependsJava scanner(srcFile);
scanner.SetTargetFile(".",objFile,".depends",".depends.make");
return scanner.Write();
}
#endif