summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalVisualStudio7Generator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2011-08-03 21:24:43 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2011-08-03 21:24:43 (GMT)
commit3c53fbb1f0d7276d0ef1f07facb2a1d937fc5153 (patch)
treef73fa1e39ea2396eb041ce680d67d4bd15cd5486 /Source/cmLocalVisualStudio7Generator.cxx
parent6c72d25aee92c6cd412c79969b7b18a814ac99cb (diff)
downloadCMake-3c53fbb1f0d7276d0ef1f07facb2a1d937fc5153.zip
CMake-3c53fbb1f0d7276d0ef1f07facb2a1d937fc5153.tar.gz
CMake-3c53fbb1f0d7276d0ef1f07facb2a1d937fc5153.tar.bz2
Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
For custom commands in VS2010 Fortran projects the INTDIR variable is different than in the rest of the solution because Intel fortran still uses the old VS project files even in VS2010. So, we replace $(Configuration) directly in the project files. I have also added a FortranOnly test that tests this feature and is run on any generator that has Fortran abilities.
Diffstat (limited to 'Source/cmLocalVisualStudio7Generator.cxx')
-rw-r--r--Source/cmLocalVisualStudio7Generator.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx
index 7a62b9c..d254164 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -1622,6 +1622,10 @@ WriteCustomRule(std::ostream& fout,
}
std::string script = this->ConstructScript(command, i->c_str());
+ if(this->FortranProject)
+ {
+ cmSystemTools::ReplaceString(script, "$(Configuration)", i->c_str());
+ }
fout << "\t\t\t\t\t<Tool\n"
<< "\t\t\t\t\tName=\"" << customTool << "\"\n"
<< "\t\t\t\t\tDescription=\""