summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-09-14 13:19:21 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-09-14 13:19:21 (GMT)
commitd3855438656484207b3d28b3b65b623c8f9e5a00 (patch)
tree7c6a3d7bd52907914dc6e8a3ec8e993f83471b32
parente6c7707022bb6a9977dbe372cb40cfb6ef415e5f (diff)
downloadCMake-d3855438656484207b3d28b3b65b623c8f9e5a00.zip
CMake-d3855438656484207b3d28b3b65b623c8f9e5a00.tar.gz
CMake-d3855438656484207b3d28b3b65b623c8f9e5a00.tar.bz2
BUG: fix include external project bug
-rw-r--r--Source/cmGlobalVisualStudio71Generator.cxx1
-rw-r--r--Source/cmGlobalVisualStudio7Generator.cxx3
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalVisualStudio71Generator.cxx b/Source/cmGlobalVisualStudio71Generator.cxx
index 315b2aa..a65fc67 100644
--- a/Source/cmGlobalVisualStudio71Generator.cxx
+++ b/Source/cmGlobalVisualStudio71Generator.cxx
@@ -128,7 +128,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
depends.push_back(cc.GetOutput());
this->WriteExternalProject(fout, stuff[0].c_str(),
stuff[1].c_str(), depends);
- ++si;
}
else
{
diff --git a/Source/cmGlobalVisualStudio7Generator.cxx b/Source/cmGlobalVisualStudio7Generator.cxx
index 8b80ee1..97fef56 100644
--- a/Source/cmGlobalVisualStudio7Generator.cxx
+++ b/Source/cmGlobalVisualStudio7Generator.cxx
@@ -34,6 +34,8 @@ void cmGlobalVisualStudio7Generator::EnableLanguage(std::vector<std::string>cons
mf->AddDefinition("CMAKE_CFG_INTDIR","$(IntDir)");
mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
+ mf->AddDefinition("CMAKE_GENERATOR_RC", "rc");
+ mf->AddDefinition("CMAKE_GENERATOR_Fortran", "ifort");
// Create list of configurations requested by user's cache, if any.
this->GenerateConfigurations(mf);
@@ -396,7 +398,6 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
depends.push_back(cc.GetOutput());
this->WriteExternalProject(fout, stuff[0].c_str(),
stuff[1].c_str(), depends);
- ++si;
}
else
{