diff options
Diffstat (limited to 'Source/cmMSDotNETGenerator.cxx')
| -rw-r--r-- | Source/cmMSDotNETGenerator.cxx | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/Source/cmMSDotNETGenerator.cxx b/Source/cmMSDotNETGenerator.cxx index fb6921c..71682c6 100644 --- a/Source/cmMSDotNETGenerator.cxx +++ b/Source/cmMSDotNETGenerator.cxx @@ -720,9 +720,11 @@ void cmMSDotNETGenerator::WriteConfiguration(std::ostream& fout, << "\t\t\tCharacterSet=\"2\">\n"; fout << "\t\t\t<Tool\n" << "\t\t\t\tName=\"VCCLCompilerTool\"\n" - << "\t\t\t\tAdditionalOptions=\"" << - m_Makefile->GetDefinition("CMAKE_CXX_FLAGS") << "\"\n"; - + << "\t\t\t\tAdditionalOptions=\"" + << m_Makefile->GetDefinition("CMAKE_CXX_FLAGS") + << " -DCMAKE_INTDIR=\\"" << configName << "\\"" + << "\"\n"; + fout << "\t\t\t\tAdditionalIncludeDirectories=\""; std::vector<std::string>& includes = m_Makefile->GetIncludeDirectories(); std::vector<std::string>::iterator i = includes.begin(); @@ -891,14 +893,14 @@ void cmMSDotNETGenerator::OutputBuildTool(std::ostream& fout, void cmMSDotNETGenerator::OutputModuleDefinitionFile(std::ostream& fout, const cmTarget &target) { - std::vector<cmSourceFile> const& classes = target.GetSourceFiles(); - for(std::vector<cmSourceFile>::const_iterator i = classes.begin(); + std::vector<cmSourceFile*> const& classes = target.GetSourceFiles(); + for(std::vector<cmSourceFile*>::const_iterator i = classes.begin(); i != classes.end(); i++) { - if(cmSystemTools::UpperCase(i->GetSourceExtension()) == "DEF") + if(cmSystemTools::UpperCase((*i)->GetSourceExtension()) == "DEF") { fout << "\t\t\t\tModuleDefinitionFile=\"" - << this->ConvertToXMLOutputPath(i->GetFullPath().c_str()) + << this->ConvertToXMLOutputPath((*i)->GetFullPath().c_str()) << "\"\n"; return; } @@ -1011,20 +1013,20 @@ void cmMSDotNETGenerator::WriteVCProjFile(std::ostream& fout, std::vector<cmSourceGroup> sourceGroups = m_Makefile->GetSourceGroups(); // get the classes from the source lists then add them to the groups - std::vector<cmSourceFile> const& classes = target.GetSourceFiles(); - for(std::vector<cmSourceFile>::const_iterator i = classes.begin(); + std::vector<cmSourceFile*> const& classes = target.GetSourceFiles(); + for(std::vector<cmSourceFile*>::const_iterator i = classes.begin(); i != classes.end(); i++) { // Add the file to the list of sources. - std::string source = i->GetFullPath(); - if(cmSystemTools::UpperCase(i->GetSourceExtension()) == "DEF") + std::string source = (*i)->GetFullPath(); + if(cmSystemTools::UpperCase((*i)->GetSourceExtension()) == "DEF") { - m_ModuleDefinitionFile = i->GetFullPath(); + m_ModuleDefinitionFile = (*i)->GetFullPath(); } cmSourceGroup& sourceGroup = m_Makefile->FindSourceGroup(source.c_str(), sourceGroups); - sourceGroup.AddSource(source.c_str(), &(*i)); + sourceGroup.AddSource(source.c_str(), *i); } // add any custom rules to the source groups |