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

BUG: CompilerIsMipsPro needs to redirect stderr to stdout so that the test output can be checked.

This commit is contained in:
Brad King 2001-07-23 14:43:23 -04:00
parent 4a52b0e6c3
commit 9adacc17f8
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/cmConfigureGccXmlCommand.cxx
View File

@ -67,34 +67,29 @@ bool cmConfigureGccXmlCommand::InitialPass(std::vector<std::string>& args)
// Get the gccxml support directory location. This is based on the
// executable location.
m_SupportDir = this->GetSupportDirectory(args[0].c_str());
if(!this->GetSupportDirectory(args[0].c_str()))
{ return false; }
#if defined(_WIN32) && !defined(__CYGWIN__)
// On Windows, we will just look at VcInclude/FLAGS.txt for now.
if(!this->FindVcIncludeFlags())
{
return false;
}
{ return false; }
#else
// On UNIX, we have to determine which compiler is being used, and
// attempt to use that compiler's support directory.
if(this->CompilerIsGCC())
{
if(!this->FindGccIncludeFlags())
{
return false;
}
{ return false; }
}
else if(this->CompilerIsMipsPro())
{
if(!this->FindMproIncludeFlags())
{
return false;
}
{ return false; }
}
else
{
this->SetError("Compiler is not supported by GCC-XML!");
this->SetError("Compiler is not supported by GCC-XML!\n");
return false;
}
#endif
@ -116,10 +111,18 @@ bool cmConfigureGccXmlCommand::InitialPass(std::vector<std::string>& args)
* support library tree. Subdirectories of the returned location should
* contain the compiler-specific support libraries.
*/
std::string cmConfigureGccXmlCommand::GetSupportDirectory(const char* exeLoc)
bool cmConfigureGccXmlCommand::GetSupportDirectory(const char* exeLoc)
{
std::string gccxml = exeLoc;
m_Makefile->ExpandVariablesInString(gccxml);
if(!cmSystemTools::FileExists(gccxml.c_str()))
{
std::string err = "Can't find GCC-XML at given path: ";
err += gccxml;
this->SetError(err.c_str());
return false;
}
std::string dir;
std::string file;
@ -137,7 +140,8 @@ std::string cmConfigureGccXmlCommand::GetSupportDirectory(const char* exeLoc)
}
#endif
return dir;
m_SupportDir = dir;
return true;
}
@ -249,7 +253,7 @@ bool cmConfigureGccXmlCommand::CompilerIsMipsPro() const
const char* compiler = m_Makefile->GetDefinition("CMAKE_CXX_COMPILER");
if(!compiler) { return false; }
std::string command = compiler;
command += " -version";
command += " -version 2>&1";
std::string output;
if(!cmSystemTools::RunCommand(command.c_str(), output, false))
{ return false; }

2
Source/cmConfigureGccXmlCommand.h
View File

@ -97,7 +97,7 @@ public:
cmTypeMacro(cmConfigureGccXmlCommand, cmCommand);
protected:
std::string GetSupportDirectory(const char*);
bool GetSupportDirectory(const char*);
bool FindVcIncludeFlags();
bool FindGccIncludeFlags();
bool FindMproIncludeFlags();