ENH: Added generation of --gccxml-compiler argument to GCC-XML for msvc6, msvc7, and nmake makefiles generators.
This commit is contained in:
parent
12215e56f3
commit
f33fda6720
@ -93,6 +93,41 @@ bool cmITKWrapTclCommand::CreateCableRule(const char* configFile)
|
|||||||
commandArgs.push_back("--gccxml-cxxflags");
|
commandArgs.push_back("--gccxml-cxxflags");
|
||||||
commandArgs.push_back(tmp);
|
commandArgs.push_back(tmp);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
const char* genName = m_Makefile->GetDefinition("CMAKE_GENERATOR");
|
||||||
|
if (genName)
|
||||||
|
{
|
||||||
|
std::string gen = genName;
|
||||||
|
if(gen == "Visual Studio 6")
|
||||||
|
{
|
||||||
|
commandArgs.push_back("--gccxml-compiler");
|
||||||
|
commandArgs.push_back("msvc6");
|
||||||
|
tmp = "${CMAKE_CXX_FLAGS}";
|
||||||
|
m_Makefile->ExpandVariablesInString(tmp);
|
||||||
|
commandArgs.push_back("--gccxml-cxxflags");
|
||||||
|
commandArgs.push_back(tmp);
|
||||||
|
}
|
||||||
|
else if(gen == "Visual Studio 7")
|
||||||
|
{
|
||||||
|
commandArgs.push_back("--gccxml-compiler");
|
||||||
|
commandArgs.push_back("msvc7");
|
||||||
|
tmp = "${CMAKE_CXX_FLAGS}";
|
||||||
|
m_Makefile->ExpandVariablesInString(tmp);
|
||||||
|
commandArgs.push_back("--gccxml-cxxflags");
|
||||||
|
commandArgs.push_back(tmp);
|
||||||
|
}
|
||||||
|
else if(gen == "NMake Makefiles")
|
||||||
|
{
|
||||||
|
tmp = "${CMAKE_CXX_COMPILER}";
|
||||||
|
m_Makefile->ExpandVariablesInString(tmp);
|
||||||
|
commandArgs.push_back("--gccxml-compiler");
|
||||||
|
commandArgs.push_back(tmp);
|
||||||
|
tmp = "${CMAKE_CXX_FLAGS}";
|
||||||
|
m_Makefile->ExpandVariablesInString(tmp);
|
||||||
|
commandArgs.push_back("--gccxml-cxxflags");
|
||||||
|
commandArgs.push_back(tmp);
|
||||||
|
}
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
const char* gccxml = m_Makefile->GetDefinition("ITK_GCCXML_EXECUTABLE");
|
const char* gccxml = m_Makefile->GetDefinition("ITK_GCCXML_EXECUTABLE");
|
||||||
if(gccxml)
|
if(gccxml)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user