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

Merge topic 'add-whitespace' 

2331b57 Add whitespace after colons in error messages.
This commit is contained in:
Brad King 2013-06-24 08:38:12 -04:00 committed by CMake Topic Stage
parent a931970955 2331b57bec
commit 059be4ba3b
13 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmComputeLinkInformation.cxx
View File

@ -499,7 +499,7 @@ bool cmComputeLinkInformation::Compute()
if(!this->LinkLanguage)
{
cmSystemTools::
Error("CMake can not determine linker language for target:",
Error("CMake can not determine linker language for target: ",
this->Target->GetName());
return false;
}

14
Source/cmGlobalGenerator.cxx
View File

@ -415,7 +415,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
{
if(!mf->ReadListFile(0,fpath.c_str()))
{
cmSystemTools::Error("Could not find cmake module file:",
cmSystemTools::Error("Could not find cmake module file: ",
fpath.c_str());
}
// if this file was found then the language was already determined
@ -445,7 +445,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
mf->GetModulesFile(determineCompiler.c_str());
if(!mf->ReadListFile(0,determineFile.c_str()))
{
cmSystemTools::Error("Could not find cmake module file:",
cmSystemTools::Error("Could not find cmake module file: ",
determineFile.c_str());
}
needTestLanguage[lang] = true;
@ -479,7 +479,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
fpath += "Compiler.cmake";
if(!mf->ReadListFile(0,fpath.c_str()))
{
cmSystemTools::Error("Could not find cmake module file:",
cmSystemTools::Error("Could not find cmake module file: ",
fpath.c_str());
}
this->SetLanguageEnabledFlag(lang, mf);
@ -498,7 +498,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
fpath = mf->GetModulesFile("CMakeSystemSpecificInformation.cmake");
if(!mf->ReadListFile(0,fpath.c_str()))
{
cmSystemTools::Error("Could not find cmake module file:",
cmSystemTools::Error("Could not find cmake module file: ",
fpath.c_str());
}
}
@ -524,12 +524,12 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
std::string informationFile = mf->GetModulesFile(fpath.c_str());
if (informationFile.empty())
{
cmSystemTools::Error("Could not find cmake module file:",
cmSystemTools::Error("Could not find cmake module file: ",
fpath.c_str());
}
else if(!mf->ReadListFile(0, informationFile.c_str()))
{
cmSystemTools::Error("Could not process cmake module file:",
cmSystemTools::Error("Could not process cmake module file: ",
informationFile.c_str());
}
}
@ -568,7 +568,7 @@ cmGlobalGenerator::EnableLanguage(std::vector<std::string>const& languages,
std::string ifpath = mf->GetModulesFile(testLang.c_str());
if(!mf->ReadListFile(0,ifpath.c_str()))
{
cmSystemTools::Error("Could not find cmake module file:",
cmSystemTools::Error("Could not find cmake module file: ",
ifpath.c_str());
}
std::string compilerWorks = "CMAKE_";

2
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1719,7 +1719,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
else if(binary)
{
cmSystemTools::Error
("CMake can not determine linker language for target:",
("CMake can not determine linker language for target: ",
target.GetName());
return;
}

4
Source/cmLocalGenerator.cxx
View File

@ -761,7 +761,7 @@ void cmLocalGenerator
if(!llang)
{
cmSystemTools::Error
("CMake can not determine linker language for target:",
("CMake can not determine linker language for target: ",
target.Target->GetName());
return;
}
@ -1600,7 +1600,7 @@ void cmLocalGenerator::GetTargetFlags(std::string& linkLibs,
if(!linkLanguage)
{
cmSystemTools::Error
("CMake can not determine linker language for target:",
("CMake can not determine linker language for target: ",
target->Target->GetName());
return;
}

4
Source/cmLocalVisualStudio6Generator.cxx
View File

@ -1228,7 +1228,7 @@ void cmLocalVisualStudio6Generator
if(!linkLanguage)
{
cmSystemTools::Error
("CMake can not determine linker language for target:",
("CMake can not determine linker language for target: ",
target.GetName());
return;
}
@ -1649,7 +1649,7 @@ void cmLocalVisualStudio6Generator
if(!linkLanguage)
{
cmSystemTools::Error
("CMake can not determine linker language for target:",
("CMake can not determine linker language for target: ",
target.GetName());
return;
}

2
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -686,7 +686,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout,
if(!linkLanguage)
{
cmSystemTools::Error
("CMake can not determine linker language for target:",
("CMake can not determine linker language for target: ",
target.GetName());
return;
}

3
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -71,7 +71,8 @@ cmNinjaNormalTargetGenerator::~cmNinjaNormalTargetGenerator()
void cmNinjaNormalTargetGenerator::Generate()
{
if (!this->TargetLinkLanguage) {
cmSystemTools::Error("CMake can not determine linker language for target:",
cmSystemTools::Error("CMake can not determine linker language for "
"target: ",
this->GetTarget()->GetName());
return;
}

2
Source/cmQtAutomoc.cxx
View File

@ -411,7 +411,7 @@ bool cmQtAutomoc::ReadAutomocInfoFile(cmMakefile* makefile,
if (!makefile->ReadListFile(0, filename.c_str()))
{
cmSystemTools::Error("Error processing file:", filename.c_str());
cmSystemTools::Error("Error processing file: ", filename.c_str());
return false;
}

2
Source/cmSystemTools.cxx
View File

@ -1951,7 +1951,7 @@ bool extract_tar(const char* outFileName, bool verbose,
{
cmSystemTools::Error("Problem with archive_write_header(): ",
archive_error_string(ext));
cmSystemTools::Error("Current file:",
cmSystemTools::Error("Current file: ",
archive_entry_pathname(entry));
break;
}

6
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -1249,7 +1249,7 @@ bool cmVisualStudio10TargetGenerator::ComputeClOptions(
if(!linkLanguage)
{
cmSystemTools::Error
("CMake can not determine linker language for target:",
("CMake can not determine linker language for target: ",
this->Name.c_str());
return false;
}
@ -1429,7 +1429,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
if(!linkLanguage)
{
cmSystemTools::Error
("CMake can not determine linker language for target:",
("CMake can not determine linker language for target: ",
this->Name.c_str());
return false;
}
@ -1511,7 +1511,7 @@ cmVisualStudio10TargetGenerator::ComputeLinkOptions(std::string const& config)
if(!pcli)
{
cmSystemTools::Error
("CMake can not compute cmComputeLinkInformation for target:",
("CMake can not compute cmComputeLinkInformation for target: ",
this->Name.c_str());
return false;
}

2
Source/cmake.cxx
View File

@ -549,7 +549,7 @@ void cmake::ReadListFile(const std::vector<std::string>& args,
}
if (!lg->GetMakefile()->ReadListFile(0, path))
{
cmSystemTools::Error("Error processing file:", path);
cmSystemTools::Error("Error processing file: ", path);
}
}

2
Tests/CMakeLists.txt
View File

@ -245,7 +245,7 @@ if(BUILD_TESTING)
ADD_TEST_MACRO(CompileOptions CompileOptions)
ADD_TEST_MACRO(CompatibleInterface CompatibleInterface)
set_tests_properties(EmptyLibrary PROPERTIES
PASS_REGULAR_EXPRESSION "CMake Error: CMake can not determine linker language for target:test")
PASS_REGULAR_EXPRESSION "CMake Error: CMake can not determine linker language for target: test")
ADD_TEST_MACRO(CrossCompile CrossCompile)
set_tests_properties(CrossCompile PROPERTIES
PASS_REGULAR_EXPRESSION "TRY_RUN.. invoked in cross-compiling mode")

2
Tests/RunCMake/Languages/NoLangSHARED-stderr.txt
View File

@ -1 +1 @@
CMake Error: CMake can not determine linker language for target:NoLang
CMake Error: CMake can not determine linker language for target: NoLang