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

Merge topic 'fix-8707-add-vs-globals' 

37d8602 Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals
6c72d25 Initial support for Intel Fortran VS2010.
This commit is contained in:
David Cole 2011-08-16 17:01:28 -04:00 committed by CMake Topic Stage
parent 2bfd55a7c6 37d8602cde
commit 6d5819ca6c
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmLocalVisualStudio10Generator.cxx
View File

@ -93,10 +93,18 @@ void cmLocalVisualStudio10Generator::Generate()
for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l) for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); ++l)
{ {
cmVisualStudio10TargetGenerator tg( if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
&l->second, static_cast<cmGlobalVisualStudio10Generator*>( ->TargetIsFortranOnly(l->second))
this->GetGlobalGenerator())); {
tg.Generate(); this->CreateSingleVCProj(l->first.c_str(),l->second);
}
else
{
cmVisualStudio10TargetGenerator tg(
&l->second, static_cast<cmGlobalVisualStudio10Generator*>(
this->GetGlobalGenerator()));
tg.Generate();
}
} }
this->WriteStampFiles(); this->WriteStampFiles();
} }

3
Source/cmLocalVisualStudio7Generator.h
View File

@ -75,6 +75,8 @@ public:
virtual void ReadAndStoreExternalGUID(const char* name, virtual void ReadAndStoreExternalGUID(const char* name,
const char* path); const char* path);
protected:
void CreateSingleVCProj(const char *lname, cmTarget &tgt);
private: private:
typedef cmVisualStudioGeneratorOptions Options; typedef cmVisualStudioGeneratorOptions Options;
typedef cmLocalVisualStudio7GeneratorFCInfo FCInfo; typedef cmLocalVisualStudio7GeneratorFCInfo FCInfo;
@ -85,7 +87,6 @@ private:
void WriteVCProjHeader(std::ostream& fout, const char *libName, void WriteVCProjHeader(std::ostream& fout, const char *libName,
cmTarget &tgt, std::vector<cmSourceGroup> &sgs); cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
void WriteVCProjFooter(std::ostream& fout, cmTarget &target); void WriteVCProjFooter(std::ostream& fout, cmTarget &target);
void CreateSingleVCProj(const char *lname, cmTarget &tgt);
void WriteVCProjFile(std::ostream& fout, const char *libName, void WriteVCProjFile(std::ostream& fout, const char *libName,
cmTarget &tgt); cmTarget &tgt);
void WriteConfigurations(std::ostream& fout, void WriteConfigurations(std::ostream& fout,