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

BUG: fix include external project bug

This commit is contained in:
Bill Hoffman 2004-09-14 09:19:21 -04:00
parent e6c7707022
commit d385543865
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -128,7 +128,6 @@ void cmGlobalVisualStudio71Generator::WriteSLNFile(std::ostream& fout,
depends.push_back(cc.GetOutput()); depends.push_back(cc.GetOutput());
this->WriteExternalProject(fout, stuff[0].c_str(), this->WriteExternalProject(fout, stuff[0].c_str(),
stuff[1].c_str(), depends); stuff[1].c_str(), depends);
++si;
} }
else else
{ {

3
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -34,6 +34,8 @@ void cmGlobalVisualStudio7Generator::EnableLanguage(std::vector<std::string>cons
mf->AddDefinition("CMAKE_CFG_INTDIR","$(IntDir)"); mf->AddDefinition("CMAKE_CFG_INTDIR","$(IntDir)");
mf->AddDefinition("CMAKE_GENERATOR_CC", "cl"); mf->AddDefinition("CMAKE_GENERATOR_CC", "cl");
mf->AddDefinition("CMAKE_GENERATOR_CXX", "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. // Create list of configurations requested by user's cache, if any.
this->GenerateConfigurations(mf); this->GenerateConfigurations(mf);
@ -396,7 +398,6 @@ void cmGlobalVisualStudio7Generator::WriteSLNFile(std::ostream& fout,
depends.push_back(cc.GetOutput()); depends.push_back(cc.GetOutput());
this->WriteExternalProject(fout, stuff[0].c_str(), this->WriteExternalProject(fout, stuff[0].c_str(),
stuff[1].c_str(), depends); stuff[1].c_str(), depends);
++si;
} }
else else
{ {