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

force cxx compiler for cxx files

This commit is contained in:
Bill Hoffman 2003-03-17 09:15:57 -05:00
parent a2c4d8eb90
commit 0afb1fa1aa
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -289,11 +289,18 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
std::string source = cc->first;
const cmSourceGroup::Commands& commands = cc->second.m_Commands;
std::vector<std::string> depends;
const char* compileFlags = 0;
std::string compileFlags;
if(cc->second.m_SourceFile)
{
// Check for extra compiler flags.
compileFlags = cc->second.m_SourceFile->GetProperty("COMPILE_FLAGS");
if(cmSystemTools::GetFileFormat(
cc->second.m_SourceFile->GetSourceExtension().c_str())
== cmSystemTools::CXX_FILE_FORMAT)
{
// force a C++ file type
compileFlags += " /TP ";
}
// Check for extra object-file dependencies.
const char* dependsValue =
@ -329,13 +336,14 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
std::string totalCommandStr;
totalCommandStr = this->CombineCommands(commands, totalCommand,
source.c_str());
const char* comment = totalCommand.m_Comment.c_str();
const char* comment = totalCommand.m_Comment.c_str();
const char* flags = compileFlags.size() ? compileFlags.c_str(): 0;
this->WriteCustomRule(fout, source.c_str(), totalCommandStr.c_str(),
(*comment?comment:"Custom Rule"),
totalCommand.m_Depends,
totalCommand.m_Outputs, compileFlags);
totalCommand.m_Outputs, flags);
}
else if(compileFlags)
else if(compileFlags.size())
{
for(std::vector<std::string>::iterator i
= m_Configurations.begin(); i != m_Configurations.end(); ++i)
@ -895,8 +903,6 @@ void cmLocalVisualStudio6Generator::WriteDSPHeader(std::ostream& fout, const cha
flagsDebugRel += " -DCMAKE_INTDIR=\\\"RelWithDebInfo\\\" ";
flags = " ";
flags = m_Makefile->GetDefinition("CMAKE_CXX_FLAGS");
// force a C++ file type
flags += " /TP ";
}
// if C and the target is not CXX
else if(gen->GetLanguageEnabled("C") && !target.HasCxx())

18
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -250,7 +250,6 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
if(target.HasCxx())
{
flags = m_Makefile->GetDefinition("CMAKE_CXX_FLAGS");
flags += " -TP ";
}
else
{
@ -725,13 +724,19 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
{
std::string source = cc->first;
const cmSourceGroup::Commands& commands = cc->second.m_Commands;
const char* compileFlags = 0;
std::string compileFlags;
std::string additionalDeps;
if(cc->second.m_SourceFile)
{
// Check for extra compiler flags.
compileFlags = cc->second.m_SourceFile->GetProperty("COMPILE_FLAGS");
if(cmSystemTools::GetFileFormat(
cc->second.m_SourceFile->GetSourceExtension().c_str())
== cmSystemTools::CXX_FILE_FORMAT)
{
// force a C++ file type
compileFlags += " /TP ";
}
// Check for extra object-file dependencies.
const char* deps =
cc->second.m_SourceFile->GetProperty("OBJECT_DEPENDS");
@ -765,12 +770,13 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
totalCommandStr = this->CombineCommands(commands, totalCommand,
source.c_str());
const char* comment = totalCommand.m_Comment.c_str();
const char* flags = compileFlags.size() ? compileFlags.c_str(): 0;
this->WriteCustomRule(fout, source.c_str(), totalCommandStr.c_str(),
(*comment?comment:"Custom Rule"),
totalCommand.m_Depends,
totalCommand.m_Outputs, compileFlags);
totalCommand.m_Outputs, flags);
}
else if(compileFlags || additionalDeps.length())
else if(compileFlags.size() || additionalDeps.length())
{
for(std::vector<std::string>::iterator i = configs->begin();
i != configs->end(); ++i)
@ -779,7 +785,7 @@ void cmLocalVisualStudio7Generator::WriteVCProjFile(std::ostream& fout,
<< "\t\t\t\t\tName=\"" << *i << "|Win32\">\n"
<< "\t\t\t\t\t<Tool\n"
<< "\t\t\t\t\tName=\"VCCLCompilerTool\"\n";
if(compileFlags)
if(compileFlags.size())
{
fout << "\t\t\t\t\tAdditionalOptions=\""
<< compileFlags << "\"\n";