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

Merge topic 'improve-try_compile-error-messages' 

1bee6b1 Improve try_compile and try_run error messages
This commit is contained in:
Brad King 2011-01-26 15:22:00 -05:00 committed by CMake Topic Stage
parent c9d3b602d0 1bee6b172b
commit 41147fcf48
1 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
Source/cmCoreTryCompile.cxx
View File

@ -1,6 +1,6 @@
/*============================================================================ /*============================================================================
CMake - Cross Platform Makefile Generator CMake - Cross Platform Makefile Generator
Copyright 2000-2009 Kitware, Inc., Insight Software Consortium Copyright 2000-2011 Kitware, Inc., Insight Software Consortium
Distributed under the OSI-approved BSD License (the "License"); Distributed under the OSI-approved BSD License (the "License");
see accompanying file Copyright.txt for details. see accompanying file Copyright.txt for details.
@ -56,7 +56,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
{ {
if ( argv.size() <= (i+1) ) if ( argv.size() <= (i+1) )
{ {
cmSystemTools::Error( this->Makefile->IssueMessage(cmake::FATAL_ERROR,
"OUTPUT_VARIABLE specified but there is no variable"); "OUTPUT_VARIABLE specified but there is no variable");
return -1; return -1;
} }
@ -92,7 +92,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
{ {
if ( argv.size() <= (i+1) ) if ( argv.size() <= (i+1) )
{ {
cmSystemTools::Error( this->Makefile->IssueMessage(cmake::FATAL_ERROR,
"COPY_FILE specified but there is no variable"); "COPY_FILE specified but there is no variable");
return -1; return -1;
} }
@ -120,13 +120,14 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
// only valid for srcfile signatures // only valid for srcfile signatures
if (compileFlags.size()) if (compileFlags.size())
{ {
cmSystemTools::Error( this->Makefile->IssueMessage(cmake::FATAL_ERROR,
"COMPILE_FLAGS specified on a srcdir type TRY_COMPILE"); "COMPILE_FLAGS specified on a srcdir type TRY_COMPILE");
return -1; return -1;
} }
if (copyFile.size()) if (copyFile.size())
{ {
cmSystemTools::Error("COPY_FILE specified on a srcdir type TRY_COMPILE"); this->Makefile->IssueMessage(cmake::FATAL_ERROR,
"COPY_FILE specified on a srcdir type TRY_COMPILE");
return -1; return -1;
} }
} }
@ -136,9 +137,10 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
// do not allow recursive try Compiles // do not allow recursive try Compiles
if (this->BinaryDirectory == this->Makefile->GetHomeOutputDirectory()) if (this->BinaryDirectory == this->Makefile->GetHomeOutputDirectory())
{ {
cmSystemTools::Error( cmOStringStream e;
"Attempt at a recursive or nested TRY_COMPILE in directory ", e << "Attempt at a recursive or nested TRY_COMPILE in directory\n"
this->BinaryDirectory.c_str()); << " " << this->BinaryDirectory << "\n";
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
return -1; return -1;
} }
@ -158,9 +160,11 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
FILE *fout = fopen(outFileName.c_str(),"w"); FILE *fout = fopen(outFileName.c_str(),"w");
if (!fout) if (!fout)
{ {
cmSystemTools::Error("Failed to create CMakeList file for ", cmOStringStream e;
outFileName.c_str()); e << "Failed to open\n"
cmSystemTools::ReportLastSystemError(""); << " " << outFileName.c_str() << "\n"
<< cmSystemTools::GetLastSystemError();
this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
return -1; return -1;
} }
@ -199,10 +203,12 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
} }
else else
{ {
fclose(fout);
cmOStringStream err; cmOStringStream err;
err << "Unknown extension \"" << ext << "\" for file \"" err << "Unknown extension \"" << ext << "\" for file\n"
<< source << "\". TRY_COMPILE only works for enabled languages.\n" << " " << source << "\n"
<< "Currently enabled languages are:"; << "try_compile() works only for enabled languages. "
<< "Currently these are:\n ";
std::vector<std::string> langs; std::vector<std::string> langs;
this->Makefile->GetCMakeInstance()->GetGlobalGenerator()-> this->Makefile->GetCMakeInstance()->GetGlobalGenerator()->
GetEnabledLanguages(langs); GetEnabledLanguages(langs);
@ -211,9 +217,8 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
{ {
err << " " << *l; err << " " << *l;
} }
err << "\nSee PROJECT command for help enabling other languages."; err << "\nSee project() command to enable other languages.";
cmSystemTools::Error(err.str().c_str()); this->Makefile->IssueMessage(cmake::FATAL_ERROR, err.str());
fclose(fout);
return -1; return -1;
} }
std::string langFlags = "CMAKE_"; std::string langFlags = "CMAKE_";
@ -340,17 +345,15 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
copyFile.c_str())) copyFile.c_str()))
{ {
cmOStringStream emsg; cmOStringStream emsg;
emsg << "Could not COPY_FILE.\n" emsg << "Cannot copy output executable\n"
<< " OutputFile: '" << this->OutputFile.c_str() << "'\n" << " '" << this->OutputFile.c_str() << "'\n"
<< " copyFile: '" << copyFile.c_str() << "'\n"; << "to destination specified by COPY_FILE:\n"
<< " '" << copyFile.c_str() << "'\n";
if (this->FindErrorMessage.size()) if(!this->FindErrorMessage.empty())
{ {
emsg << "\n"; emsg << this->FindErrorMessage.c_str();
emsg << this->FindErrorMessage.c_str() << "\n";
} }
this->Makefile->IssueMessage(cmake::FATAL_ERROR, emsg.str());
cmSystemTools::Error(emsg.str().c_str());
return -1; return -1;
} }
} }
@ -457,18 +460,11 @@ void cmCoreTryCompile::FindOutputFile(const char* targetName)
} }
cmOStringStream emsg; cmOStringStream emsg;
emsg << "Unable to find executable for " << this->GetName() << ": tried \""; emsg << "Unable to find the executable at any of:\n";
for (unsigned int i = 0; i < searchDirs.size(); ++i) for (unsigned int i = 0; i < searchDirs.size(); ++i)
{ {
emsg << this->BinaryDirectory << searchDirs[i] << tmpOutputFile; emsg << " " << this->BinaryDirectory << searchDirs[i]
if (i < searchDirs.size() - 1) << tmpOutputFile << "\n";
{
emsg << "\" and \"";
}
else
{
emsg << "\".";
}
} }
this->FindErrorMessage = emsg.str(); this->FindErrorMessage = emsg.str();
return; return;