kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

VS: For Intel Fortran .vfproj put OBJECT libs in link line (#14777) 

The Intel Fortran .vfproj format accepts the $(Configuration) placeholder
in the path to an input file but appears to consider it always out of
date.  Therefore adding OBJECT library objects as external object source
files causes the referencing binary to re-link on every build.  Work
around this problem by putting OBJECT library objects on the link line
as is done for VS < 8 already.
This commit is contained in:
Brad King 2014-02-27 09:53:16 -05:00
parent 0f9dbc1608
commit 0f55f2547f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -1044,7 +1044,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
fout << "\t\t\t<Tool\n" fout << "\t\t\t<Tool\n"
<< "\t\t\t\tName=\"" << tool << "\"\n"; << "\t\t\t\tName=\"" << tool << "\"\n";
if(this->GetVersion() < VS8) if(this->GetVersion() < VS8 || this->FortranProject)
{ {
cmOStringStream libdeps; cmOStringStream libdeps;
this->Internal->OutputObjects(libdeps, &target); this->Internal->OutputObjects(libdeps, &target);
@ -1104,7 +1104,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
// libraries which may be set by the user to something bad. // libraries which may be set by the user to something bad.
fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) " fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) "
<< this->Makefile->GetSafeDefinition(standardLibsVar.c_str()); << this->Makefile->GetSafeDefinition(standardLibsVar.c_str());
if(this->GetVersion() < VS8) if(this->GetVersion() < VS8 || this->FortranProject)
{ {
this->Internal->OutputObjects(fout, &target, " "); this->Internal->OutputObjects(fout, &target, " ");
} }
@ -1202,7 +1202,7 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
// libraries which may be set by the user to something bad. // libraries which may be set by the user to something bad.
fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) " fout << "\t\t\t\tAdditionalDependencies=\"$(NOINHERIT) "
<< this->Makefile->GetSafeDefinition(standardLibsVar.c_str()); << this->Makefile->GetSafeDefinition(standardLibsVar.c_str());
if(this->GetVersion() < VS8) if(this->GetVersion() < VS8 || this->FortranProject)
{ {
this->Internal->OutputObjects(fout, &target, " "); this->Internal->OutputObjects(fout, &target, " ");
} }
@ -1423,7 +1423,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
this->WriteGroup(&sg, target, fout, libName, configs); this->WriteGroup(&sg, target, fout, libName, configs);
} }
if(this->GetVersion() >= VS8) if(this->GetVersion() >= VS8 && !this->FortranProject)
{ {
// VS >= 8 support per-config source locations so we // VS >= 8 support per-config source locations so we
// list object library content as external objects. // list object library content as external objects.