reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-01 17:42:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: add support for Intel Fortran Visual studio IDE

Browse Source
This commit is contained in:
Bill Hoffman 2008-04-30 13:26:04 -04:00
parent e1b2fb4c75
commit 10c91ded4f
8 changed files with 320 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmGlobalVisualStudio71Generator.cxx
View File

@ -153,10 +153,19 @@ cmGlobalVisualStudio71Generator::WriteProject(std::ostream& fout,
const char* dir,
cmTarget& t)
{
fout << "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \""
// check to see if this is a fortran build
const char* ext = ".vcproj";
const char* project = "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
if(this->TargetIsFortranOnly(t))
{
ext = ".vfproj";
project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
}
fout << project
<< dspname << "\", \""
<< this->ConvertToSolutionPath(dir)
<< "\\" << dspname << ".vcproj\", \"{"
<< "\\" << dspname << ext << "\", \"{"
<< this->GetGUID(dspname) << "}\"\n";
fout << "\tProjectSection(ProjectDependencies) = postProject\n";
this->WriteProjectDepends(fout, dspname, dir, t);

19
Source/cmGlobalVisualStudio7Generator.cxx
View File

@ -35,7 +35,7 @@ void cmGlobalVisualStudio7Generator
mf->AddDefinition("CMAKE_GENERATOR_CXX", "cl");
mf->AddDefinition("CMAKE_GENERATOR_RC", "rc");
mf->AddDefinition("CMAKE_GENERATOR_NO_COMPILER_ENV", "1");
mf->AddDefinition("CMAKE_GENERATOR_Fortran", "ifort");
mf->AddDefinition("CMAKE_GENERATOR_FC", "ifort");
this->AddPlatformDefinitions(mf);
@ -482,12 +482,21 @@ cmGlobalVisualStudio7Generator::ConvertToSolutionPath(const char* path)
// the libraries it uses are also done here
void cmGlobalVisualStudio7Generator::WriteProject(std::ostream& fout,
const char* dspname,
const char* dir, cmTarget&)
{
fout << "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \""
const char* dir, cmTarget& target)
{
// check to see if this is a fortran build
const char* ext = ".vcproj";
const char* project = "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \"";
if(this->TargetIsFortranOnly(target))
{
ext = ".vfproj";
project = "Project(\"{6989167D-11E4-40FE-8C1A-2192A86A7E90}\") = \"";
}
fout << project
<< dspname << "\", \""
<< this->ConvertToSolutionPath(dir)
<< "\\" << dspname << ".vcproj\", \"{"
<< "\\" << dspname << ext << "\", \"{"
<< this->GetGUID(dspname) << "}\"\nEndProject\n";
}

15
Source/cmGlobalVisualStudioGenerator.cxx
View File

@ -704,3 +704,18 @@ void RegisterVisualStudioMacros(const std::string& macrosFile,
}
}
}
bool cmGlobalVisualStudioGenerator::TargetIsFortranOnly(cmTarget& target)
{
// check to see if this is a fortran build
std::set<cmStdString> languages;
target.GetLanguages(languages);
const char* ext = ".vcproj";
if(languages.size() == 1)
{
if(*languages.begin() == "Fortran")
{
return true;
}
}
return false;
}

3
Source/cmGlobalVisualStudioGenerator.h
View File

@ -63,6 +63,9 @@ public:
*/
virtual void CallVisualStudioMacro(MacroName m,
const char* vsSolutionFile = 0);
// return true if target is fortran only
bool TargetIsFortranOnly(cmTarget& t);
protected:
virtual void CreateGUID(const char*) {}

2
Source/cmLocalGenerator.cxx
View File

@ -2616,7 +2616,7 @@ std::string cmLocalGenerator::EscapeForShell(const char* str, bool makeVars,
else
{
cmsysSystem_Shell_GetArgumentForUnix(str, &arg[0], flags);
}
}
return std::string(&arg[0]);
}

300
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -68,6 +68,7 @@ void cmLocalVisualStudio7Generator::AddHelperCommands()
lang.insert("RC");
lang.insert("IDL");
lang.insert("DEF");
lang.insert("Fortran");
this->CreateCustomTargetsAndCommands(lang);
this->FixGlobalTargets();
}
@ -200,6 +201,9 @@ void cmLocalVisualStudio7Generator::WriteStampFiles()
void cmLocalVisualStudio7Generator
::CreateSingleVCProj(const char *lname, cmTarget &target)
{
this->FortranProject =
static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
->TargetIsFortranOnly(target);
// add to the list of projects
std::string pname = lname;
target.SetProperty("GENERATOR_FILE_NAME",lname);
@ -208,7 +212,14 @@ void cmLocalVisualStudio7Generator
fname = this->Makefile->GetStartOutputDirectory();
fname += "/";
fname += lname;
fname += ".vcproj";
if(this->FortranProject)
{
fname += ".vfproj";
}
else
{
fname += ".vcproj";
}
// Generate the project file and replace it atomically with
// copy-if-different. We use a separate timestamp so that the IDE
@ -286,7 +297,61 @@ void cmLocalVisualStudio7Generator::WriteConfigurations(std::ostream& fout,
}
fout << "\t</Configurations>\n";
}
cmVS7FlagTable cmLocalVisualStudio7GeneratorFortranFlagTable[] =
{
{"Preprocess", "fpp", "Run Preprocessor on files", "preprocessYes", 0},
{"SuppressStartupBanner", "nologo", "SuppressStartupBanner", "true", 0},
{"DebugInformationFormat", "Zi", "full debug", "debugEnabled", 0},
{"DebugInformationFormat", "debug:full", "full debug", "debugEnabled", 0},
{"DebugInformationFormat", "Z7", "c7 compat", "debugOldStyleInfo", 0},
{"DebugInformationFormat", "Zd", "line numbers", "debugLineInfoOnly", 0},
{"Optimization", "Od", "disable optimization", "optimizeDisabled", 0},
{"Optimization", "O1", "min space", "optimizeMinSpace", 0},
{"Optimization", "O3", "full optimize", "optimizeFull", 0},
{"GlobalOptimizations", "Og", "global optimize", "true", 0},
{"InlineFunctionExpansion", "Ob0", "", "expandDisable", 0},
{"InlineFunctionExpansion", "Ob1", "", "expandOnlyInline", 0},
{"FavorSizeOrSpeed", "Os", "", "favorSize", 0},
{"OmitFramePointers", "Oy-", "", "false", 0},
{"OptimizeForProcessor", "GB", "", "procOptimizeBlended", 0},
{"OptimizeForProcessor", "G5", "", "procOptimizePentium", 0},
{"OptimizeForProcessor", "G6", "", "procOptimizePentiumProThruIII", 0},
{"UseProcessorExtensions", "QzxK", "", "codeForStreamingSIMD", 0},
{"OptimizeForProcessor", "QaxN", "", "codeForPentium4", 0},
{"OptimizeForProcessor", "QaxB", "", "codeForPentiumM", 0},
{"OptimizeForProcessor", "QaxP", "", "codeForCodeNamedPrescott", 0},
{"OptimizeForProcessor", "QaxT", "", "codeForCore2Duo", 0},
{"OptimizeForProcessor", "QxK", "", "codeExclusivelyStreamingSIMD", 0},
{"OptimizeForProcessor", "QxN", "", "codeExclusivelyPentium4", 0},
{"OptimizeForProcessor", "QxB", "", "codeExclusivelyPentiumM", 0},
{"OptimizeForProcessor", "QxP", "", "codeExclusivelyCodeNamedPrescott", 0},
{"OptimizeForProcessor", "QxT", "", "codeExclusivelyCore2Duo", 0},
{"OptimizeForProcessor", "QxO", "", "codeExclusivelyCore2StreamingSIMD", 0},
{"OptimizeForProcessor", "QxS", "", "codeExclusivelyCore2StreamingSIMD4", 0},
{"ModulePath", "module:", "", "",
cmVS7FlagTable::UserValueRequired},
{"LoopUnrolling", "Qunroll:", "", "",
cmVS7FlagTable::UserValueRequired},
{"AutoParallelThreshold", "Qpar-threshold:", "", "",
cmVS7FlagTable::UserValueRequired},
{"HeapArrays", "heap-arrays:", "", "",
cmVS7FlagTable::UserValueRequired},
{"ObjectText", "bintext:", "", "",
cmVS7FlagTable::UserValueRequired},
{"Parallelization", "Qparallel", "", "true", 0},
{"PrefetchInsertion", "Qprefetch-", "", "false", 0},
{"BufferedIO", "assume:buffered_io", "", "true", 0},
{"CallingConvention", "iface:stdcall", "", "callConventionStdCall", 0},
{"CallingConvention", "iface:cref", "", "callConventionCRef", 0},
{"CallingConvention", "iface:stdref", "", "callConventionStdRef", 0},
{"CallingConvention", "iface:stdcall", "", "callConventionStdCall", 0},
{"CallingConvention", "iface:cvf", "", "callConventionCVF", 0},
{"EnableRecursion", "recursive", "", "true", 0},
{"ReentrantCode", "reentrancy", "", "true", 0},
// done up to Language
{0,0,0,0,0}
};
// fill the table here currently the comment field is not used for
// anything other than documentation NOTE: Make sure the longer
// commandFlag comes FIRST!
@ -379,6 +444,8 @@ cmVS7FlagTable cmLocalVisualStudio7GeneratorFlagTable[] =
{0,0,0,0,0}
};
cmVS7FlagTable cmLocalVisualStudio7GeneratorLinkFlagTable[] =
{
// option flags (some flags map to the same option)
@ -404,7 +471,8 @@ public:
enum Tool
{
Compiler,
Linker
Linker,
FortranCompiler
};
cmLocalVisualStudio7GeneratorOptions(cmLocalVisualStudio7Generator* lg,
int version,
@ -485,13 +553,16 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
// 1 == executable
// 10 == utility
const char* configType = "10";
const char* projectType = 0;
switch(target.GetType())
{
case cmTarget::STATIC_LIBRARY:
projectType = "typeStaticLibrary";
configType = "4";
break;
case cmTarget::SHARED_LIBRARY:
case cmTarget::MODULE_LIBRARY:
projectType = "typeDynamicLibrary";
configType = "2";
break;
case cmTarget::EXECUTABLE:
@ -503,7 +574,10 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
default:
break;
}
if(this->FortranProject && projectType)
{
configType = projectType;
}
std::string flags;
if(strcmp(configType, "10") != 0)
{
@ -516,7 +590,8 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
target.GetName());
return;
}
if(strcmp(linkLanguage, "C") == 0 || strcmp(linkLanguage, "CXX") == 0)
if(strcmp(linkLanguage, "C") == 0 || strcmp(linkLanguage, "CXX") == 0
|| strcmp(linkLanguage, "Fortran") == 0)
{
std::string baseFlagVar = "CMAKE_";
baseFlagVar += linkLanguage;
@ -551,9 +626,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
// Get preprocessor definitions for this directory.
std::string defineFlags = this->Makefile->GetDefineFlags();
// Construct a set of build options for this target.
Options targetOptions(this, this->Version, Options::Compiler, this->ExtraFlagTable);
Options::Tool t = Options::Compiler;
if(this->FortranProject)
{
t = Options::FortranCompiler;
}
Options targetOptions(this, this->Version, t, this->ExtraFlagTable);
targetOptions.FixExceptionHandlingDefault();
targetOptions.Parse(flags.c_str());
targetOptions.Parse(defineFlags.c_str());
@ -599,9 +677,31 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
{
fout << "\t\t\tCharacterSet=\"2\">\n";
}
const char* tool = "VCCLCompilerTool";
if(this->FortranProject)
{
tool = "VFFortranCompilerTool";
}
fout << "\t\t\t<Tool\n"
<< "\t\t\t\tName=\"VCCLCompilerTool\"\n";
<< "\t\t\t\tName=\"" << tool << "\"\n";
if(this->FortranProject)
{
const char* target_mod_dir =
target.GetProperty("Fortran_MODULE_DIRECTORY");
std::string modDir;
if(target_mod_dir)
{
modDir = this->Convert(target_mod_dir,
cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::UNCHANGED);
}
else
{
modDir = ".";
}
fout << "\t\t\t\tModulePath=\""
<< this->ConvertToXMLOutputPath(modDir.c_str()) << "\\$(ConfigurationName)\"\n";
}
targetOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
fout << "\t\t\t\tAdditionalIncludeDirectories=\"";
std::vector<std::string> includes;
@ -609,8 +709,18 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
std::vector<std::string>::iterator i = includes.begin();
for(;i != includes.end(); ++i)
{
// output the include path
std::string ipath = this->ConvertToXMLOutputPath(i->c_str());
fout << ipath << ";";
// if this is fortran then output the include with
// a ConfigurationName on the end of it.
if(this->FortranProject)
{
ipath = i->c_str();
ipath += "/$(ConfigurationName)";
ipath = this->ConvertToXMLOutputPath(ipath.c_str());
fout << ipath << ";";
}
}
fout << "\"\n";
targetOptions.OutputFlagMap(fout, "\t\t\t\t");
@ -629,8 +739,18 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
<< target.GetPDBName(configName) << "\"\n";
}
fout << "/>\n"; // end of <Tool Name=VCCLCompilerTool
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCCustomBuildTool\"/>\n";
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCResourceCompilerTool\"\n"
tool = "VCCustomBuildTool";
if(this->FortranProject)
{
tool = "VFCustomBuildTool";
}
fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"/>\n";
tool = "VCResourceCompilerTool";
if(this->FortranProject)
{
tool = "VFResourceCompilerTool";
}
fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n"
<< "\t\t\t\tAdditionalIncludeDirectories=\"";
for(i = includes.begin();i != includes.end(); ++i)
{
@ -641,8 +761,12 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
fout << "\"";
targetOptions.OutputPreprocessorDefinitions(fout, "\n\t\t\t\t", "");
fout << "/>\n";
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCMIDLTool\"\n";
tool = "VCMIDLTool";
if(this->FortranProject)
{
tool = "VFMIDLTool";
}
fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n";
targetOptions.OutputPreprocessorDefinitions(fout, "\t\t\t\t", "\n");
fout << "\t\t\t\tMkTypLibCompatible=\"FALSE\"\n";
if( this->PlatformName == "x64" )
@ -675,8 +799,13 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
// Add a flag telling the manifest tool to use a workaround
// for FAT32 file systems, which can cause an empty manifest
// to be embedded into the resulting executable. See CMake
// bug #2617.
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCManifestTool\"\n"
// bug #2617.
const char* tool = "VCManifestTool";
if(this->FortranProject)
{
tool = "VFManifestTool";
}
fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"\n"
<< "\t\t\t\tUseFAT32Workaround=\"true\"\n"
<< "\t\t\t/>\n";
}
@ -757,8 +886,13 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
std::string libpath = target.GetDirectory(configName);
libpath += "/";
libpath += targetNameFull;
const char* tool = "VCLibrarianTool";
if(this->FortranProject)
{
tool = "VFLibrarianTool";
}
fout << "\t\t\t<Tool\n"
<< "\t\t\t\tName=\"VCLibrarianTool\"\n";
<< "\t\t\t\tName=\"" << tool << "\"\n";
if(const char* libflags = target.GetProperty("STATIC_LIBRARY_FLAGS"))
{
fout << "\t\t\t\tAdditionalOptions=\"" << libflags << "\"\n";
@ -792,9 +926,13 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
std::string standardLibsVar = "CMAKE_";
standardLibsVar += linkLanguage;
standardLibsVar += "_STANDARD_LIBRARIES";
const char* tool = "VCLinkerTool";
if(this->FortranProject)
{
tool = "VFLinkerTool";
}
fout << "\t\t\t<Tool\n"
<< "\t\t\t\tName=\"VCLinkerTool\"\n";
<< "\t\t\t\tName=\"" << tool << "\"\n";
linkOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
// Use the NOINHERIT macro to avoid getting VS project default
// libraries which may be set by the user to something bad.
@ -861,9 +999,13 @@ void cmLocalVisualStudio7Generator::OutputBuildTool(std::ostream& fout,
std::string standardLibsVar = "CMAKE_";
standardLibsVar += linkLanguage;
standardLibsVar += "_STANDARD_LIBRARIES";
const char* tool = "VCLinkerTool";
if(this->FortranProject)
{
tool = "VFLinkerTool";
}
fout << "\t\t\t<Tool\n"
<< "\t\t\t\tName=\"VCLinkerTool\"\n";
<< "\t\t\t\tName=\"" << tool << "\"\n";
linkOptions.OutputAdditionalOptions(fout, "\t\t\t\t", "\n");
// Use the NOINHERIT macro to avoid getting VS project default
// libraries which may be set by the user to something bad.
@ -1263,14 +1405,26 @@ void cmLocalVisualStudio7Generator
if(ext == "idl")
{
aCompilerTool = "VCMIDLTool";
if(this->FortranProject)
{
aCompilerTool = "VFMIDLTool";
}
}
if(ext == "rc")
{
aCompilerTool = "VCResourceCompilerTool";
aCompilerTool = "VCResourceCompilerTool";
if(this->FortranProject)
{
aCompilerTool = "VFResourceCompilerTool";
}
}
if(ext == "def")
{
aCompilerTool = "VCCustomBuildTool";
if(this->FortranProject)
{
aCompilerTool = "VFCustomBuildTool";
}
}
for(std::map<cmStdString, cmLVS7GFileConfig>::const_iterator
fci = fcinfo.FileConfigMap.begin();
@ -1346,7 +1500,16 @@ WriteCustomRule(std::ostream& fout,
std::vector<std::string> *configs =
static_cast<cmGlobalVisualStudio7Generator *>
(this->GlobalGenerator)->GetConfigurations();
const char* compileTool = "VCCLCompilerTool";
if(this->FortranProject)
{
compileTool = "VFCLCompilerTool";
}
const char* customTool = "VCCustomBuildTool";
if(this->FortranProject)
{
customTool = "VFCustomBuildTool";
}
for(i = configs->begin(); i != configs->end(); ++i)
{
cmLVS7GFileConfig const& fc = fcinfo.FileConfigMap[*i];
@ -1355,7 +1518,7 @@ WriteCustomRule(std::ostream& fout,
if(!fc.CompileFlags.empty())
{
fout << "\t\t\t\t\t<Tool\n"
<< "\t\t\t\t\tName=\"VCCLCompilerTool\"\n"
<< "\t\t\t\t\tName=\"" << compileTool << "\"\n"
<< "\t\t\t\t\tAdditionalOptions=\""
<< this->EscapeForXML(fc.CompileFlags.c_str()) << "\"/>\n";
}
@ -1367,7 +1530,7 @@ WriteCustomRule(std::ostream& fout,
command.GetEscapeOldStyle(),
command.GetEscapeAllowMakeVars());
fout << "\t\t\t\t\t<Tool\n"
<< "\t\t\t\t\tName=\"VCCustomBuildTool\"\n"
<< "\t\t\t\t\tName=\"" << customTool << "\"\n"
<< "\t\t\t\t\tDescription=\""
<< this->EscapeForXML(comment.c_str()) << "\"\n"
<< "\t\t\t\t\tCommandLine=\""
@ -1450,9 +1613,13 @@ void cmLocalVisualStudio7Generator
{
return;
}
const char* tool = "VCPreBuildEventTool";
if(this->FortranProject)
{
tool = "VFPreBuildEventTool";
}
// add the pre build rules
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCPreBuildEventTool\"";
fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"";
bool init = false;
for (std::vector<cmCustomCommand>::const_iterator cr =
target.GetPreBuildCommands().begin();
@ -1488,7 +1655,12 @@ void cmLocalVisualStudio7Generator
fout << "/>\n";
// add the pre Link rules
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCPreLinkEventTool\"";
tool = "VCPreLinkEventTool";
if(this->FortranProject)
{
tool = "VFPreLinkEventTool";
}
fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"";
init = false;
for (std::vector<cmCustomCommand>::const_iterator cr =
target.GetPreLinkCommands().begin();
@ -1524,7 +1696,12 @@ void cmLocalVisualStudio7Generator
fout << "/>\n";
// add the PostBuild rules
fout << "\t\t\t<Tool\n\t\t\t\tName=\"VCPostBuildEventTool\"";
tool = "VCPostBuildEventTool";
if(this->FortranProject)
{
tool = "VFPostBuildEventTool";
}
fout << "\t\t\t<Tool\n\t\t\t\tName=\"" << tool << "\"";
init = false;
for (std::vector<cmCustomCommand>::const_iterator cr =
target.GetPostBuildCommands().begin();
@ -1560,12 +1737,77 @@ void cmLocalVisualStudio7Generator
fout << "/>\n";
}
void
cmLocalVisualStudio7Generator
::WriteProjectStartFortran(std::ostream& fout,
const char *libName,
cmTarget & target)
{
cmGlobalVisualStudio7Generator* gg =
static_cast<cmGlobalVisualStudio7Generator *>(this->GlobalGenerator);
fout << "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\n"
<< "<VisualStudioProject\n"
<< "\tProjectCreator=\"Intel Fortran\"\n"
<< "\tVersion=\"9.10\"\n";
const char* keyword = target.GetProperty("VS_KEYWORD");
if(!keyword)
{
keyword = "Console Application";
}
const char* projectType = 0;
switch(target.GetType())
{
case cmTarget::STATIC_LIBRARY:
projectType = "typeStaticLibrary";
if(keyword)
{
keyword = "Static Library";
}
break;
case cmTarget::SHARED_LIBRARY:
case cmTarget::MODULE_LIBRARY:
projectType = "typeDynamicLibrary";
if(!keyword)
{
keyword = "Dll";
}
break;
case cmTarget::EXECUTABLE:
if(!keyword)
{
keyword = "Console Application";
}
projectType = 0;
break;
case cmTarget::UTILITY:
case cmTarget::GLOBAL_TARGET:
default:
break;
}
if(projectType)
{
fout << "\tProjectType=\"" << projectType << "\">\n";
}
fout<< "\tKeyword=\"" << keyword << "\">\n"
<< "\tProjectGUID=\"{" << gg->GetGUID(libName) << "}\">\n"
<< "\t<Platforms>\n"
<< "\t\t<Platform\n\t\t\tName=\"" << this->PlatformName << "\"/>\n"
<< "\t</Platforms>\n";
}
void
cmLocalVisualStudio7Generator::WriteProjectStart(std::ostream& fout,
const char *libName,
cmTarget & target,
std::vector<cmSourceGroup> &)
{
if(this->FortranProject)
{
this->WriteProjectStartFortran(fout, libName, target);
return;
}
fout << "<?xml version=\"1.0\" encoding = \"Windows-1252\"?>\n"
<< "<VisualStudioProject\n"
<< "\tProjectType=\"Visual C++\"\n";
@ -1777,6 +2019,8 @@ cmLocalVisualStudio7GeneratorOptions
this->FlagTable = cmLocalVisualStudio7GeneratorFlagTable; break;
case Linker:
this->FlagTable = cmLocalVisualStudio7GeneratorLinkFlagTable; break;
case FortranCompiler:
this->FlagTable = cmLocalVisualStudio7GeneratorFortranFlagTable;
default: break;
}
}

3
Source/cmLocalVisualStudio7Generator.h
View File

@ -102,6 +102,8 @@ private:
void OutputModuleDefinitionFile(std::ostream& fout, cmTarget &target);
void WriteProjectStart(std::ostream& fout, const char *libName,
cmTarget &tgt, std::vector<cmSourceGroup> &sgs);
void WriteProjectStartFortran(std::ostream& fout, const char *libName,
cmTarget &tgt);
void WriteVCProjBeginGroup(std::ostream& fout,
const char* group,
const char* filter);
@ -124,6 +126,7 @@ private:
cmVS7FlagTable const* ExtraFlagTable;
std::string ModuleDefinitionFile;
int Version;
bool FortranProject;
std::string PlatformName; // Win32 or x64
cmLocalVisualStudio7GeneratorInternals* Internal;
};

2
Source/cmMakefile.cxx
View File

@ -83,7 +83,7 @@ cmMakefile::cmMakefile()
this->AddSourceGroup("", "^.*$");
this->AddSourceGroup
("Source Files",
"\\.(C|M|c|c\\+\\+|cc|cpp|cxx|m|mm|rc|def|r|odl|idl|hpj|bat)$");
"\\.(C|M|c|c\\+\\+|cc|cpp|cxx|f|f90|for|fpp|ftn|m|mm|rc|def|r|odl|idl|hpj|bat)$");
this->AddSourceGroup("Header Files",
"\\.(h|hh|h\\+\\+|hm|hpp|hxx|in|txx|inl)$");
this->AddSourceGroup("CMake Rules", "\\.rule$");