summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2002-11-05 00:45:19 (GMT)
committerBrad King <brad.king@kitware.com>2002-11-05 00:45:19 (GMT)
commitf33fda672000307e7355a9f852b9c8b72025e33f (patch)
treea6f8a4f8e6d109be17dcc405c5d9b8872d06a8ac
parent12215e56f3aee80f10aab5ae4afa405cde14c73d (diff)
downloadCMake-f33fda672000307e7355a9f852b9c8b72025e33f.zip
CMake-f33fda672000307e7355a9f852b9c8b72025e33f.tar.gz
CMake-f33fda672000307e7355a9f852b9c8b72025e33f.tar.bz2
ENH: Added generation of --gccxml-compiler argument to GCC-XML for msvc6, msvc7, and nmake makefiles generators.
-rw-r--r--Source/cmITKWrapTclCommand.cxx35
1 files changed, 35 insertions, 0 deletions
diff --git a/Source/cmITKWrapTclCommand.cxx b/Source/cmITKWrapTclCommand.cxx
index 656741f..512f567 100644
--- a/Source/cmITKWrapTclCommand.cxx
+++ b/Source/cmITKWrapTclCommand.cxx
@@ -93,6 +93,41 @@ bool cmITKWrapTclCommand::CreateCableRule(const char* configFile)
commandArgs.push_back("--gccxml-cxxflags");
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
const char* gccxml = m_Makefile->GetDefinition("ITK_GCCXML_EXECUTABLE");
if(gccxml)