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

STYLE: Fix some style errors

Browse Source
This commit is contained in:
Andy Cedilnik 2006-07-10 07:52:35 -04:00
parent c944a60b17
commit 0f28edbe4a
2 changed files with 88 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/CPack/cpack.cxx
View File

@ -276,11 +276,13 @@ int main (int argc, char *argv[])
} }
if ( !cpackProjectVersion.empty() ) if ( !cpackProjectVersion.empty() )
{ {
globalMF->AddDefinition("CPACK_PACKAGE_VERSION", cpackProjectVersion.c_str()); globalMF->AddDefinition("CPACK_PACKAGE_VERSION",
cpackProjectVersion.c_str());
} }
if ( !cpackProjectVendor.empty() ) if ( !cpackProjectVendor.empty() )
{ {
globalMF->AddDefinition("CPACK_PACKAGE_VENDOR", cpackProjectVendor.c_str()); globalMF->AddDefinition("CPACK_PACKAGE_VENDOR",
cpackProjectVendor.c_str());
} }
if ( !cpackProjectDirectory.empty() ) if ( !cpackProjectDirectory.empty() )
{ {
@ -333,7 +335,8 @@ int main (int argc, char *argv[])
{ {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"CPack project version not specified" << std::endl "CPack project version not specified" << std::endl
<< "Specify CPACK_PACKAGE_VERSION, or CPACK_PACKAGE_VERSION_MAJOR, " << "Specify CPACK_PACKAGE_VERSION, or "
"CPACK_PACKAGE_VERSION_MAJOR, "
"CPACK_PACKAGE_VERSION_MINOR, and CPACK_PACKAGE_VERSION_PATCH." "CPACK_PACKAGE_VERSION_MINOR, and CPACK_PACKAGE_VERSION_PATCH."
<< std::endl); << std::endl);
parsed = 0; parsed = 0;
@ -360,9 +363,10 @@ int main (int argc, char *argv[])
!mf->GetDefinition("CPACK_INSTALL_CMAKE_PROJECTS") ) !mf->GetDefinition("CPACK_INSTALL_CMAKE_PROJECTS") )
{ {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"Please specify build tree of the project that uses CMake using " "Please specify build tree of the project that uses CMake "
" CPACK_INSTALL_CMAKE_PROJECTS, specify CPACK_INSTALL_COMMANDS, or " "using CPACK_INSTALL_CMAKE_PROJECTS, specify "
"specify CPACK_INSTALLED_DIRECTORIES." "CPACK_INSTALL_COMMANDS, or specify "
"CPACK_INSTALLED_DIRECTORIES."
<< std::endl); << std::endl);
parsed = 0; parsed = 0;
} }

155
Source/cmMakefileTargetGenerator.cxx
View File

@ -73,21 +73,21 @@ cmMakefileTargetGenerator::New(cmLocalUnixMakefileGenerator3 *lg,
void cmMakefileTargetGenerator::CreateRuleFile() void cmMakefileTargetGenerator::CreateRuleFile()
{ {
// Create a directory for this target. // Create a directory for this target.
this->TargetBuildDirectory = this->TargetBuildDirectory =
this->LocalGenerator->GetTargetDirectory(*this->Target); this->LocalGenerator->GetTargetDirectory(*this->Target);
this->TargetBuildDirectoryFull = this->TargetBuildDirectoryFull =
this->LocalGenerator->ConvertToFullPath(this->TargetBuildDirectory); this->LocalGenerator->ConvertToFullPath(this->TargetBuildDirectory);
cmSystemTools::MakeDirectory(this->TargetBuildDirectoryFull.c_str()); cmSystemTools::MakeDirectory(this->TargetBuildDirectoryFull.c_str());
// Construct the rule file name. // Construct the rule file name.
this->BuildFileName = this->TargetBuildDirectory; this->BuildFileName = this->TargetBuildDirectory;
this->BuildFileName += "/build.make"; this->BuildFileName += "/build.make";
this->BuildFileNameFull = this->TargetBuildDirectoryFull; this->BuildFileNameFull = this->TargetBuildDirectoryFull;
this->BuildFileNameFull += "/build.make"; this->BuildFileNameFull += "/build.make";
// Open the rule file. This should be copy-if-different because the // Open the rule file. This should be copy-if-different because the
// rules may depend on this file itself. // rules may depend on this file itself.
this->BuildFileStream = this->BuildFileStream =
new cmGeneratedFileStream(this->BuildFileNameFull.c_str()); new cmGeneratedFileStream(this->BuildFileNameFull.c_str());
this->BuildFileStream->SetCopyIfDifferent(true); this->BuildFileStream->SetCopyIfDifferent(true);
if(!this->BuildFileStream) if(!this->BuildFileStream)
@ -108,15 +108,15 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules()
this->Makefile->GetProperty this->Makefile->GetProperty
("ADDITIONAL_MAKE_CLEAN_FILES")) ("ADDITIONAL_MAKE_CLEAN_FILES"))
{ {
cmSystemTools::ExpandListArgument(additional_clean_files, cmSystemTools::ExpandListArgument(additional_clean_files,
this->CleanFiles); this->CleanFiles);
} }
// add custom commands to the clean rules? // add custom commands to the clean rules?
const char* clean_no_custom = const char* clean_no_custom =
this->Makefile->GetProperty("CLEAN_NO_CUSTOM"); this->Makefile->GetProperty("CLEAN_NO_CUSTOM");
bool clean = cmSystemTools::IsOff(clean_no_custom); bool clean = cmSystemTools::IsOff(clean_no_custom);
// First generate the object rule files. Save a list of all object // First generate the object rule files. Save a list of all object
// files for this target. // files for this target.
const std::vector<cmSourceFile*>& sources = this->Target->GetSourceFiles(); const std::vector<cmSourceFile*>& sources = this->Target->GetSourceFiles();
@ -177,7 +177,7 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) cmLocalGenerator::MAKEFILE)
<< "\n\n"; << "\n\n";
// make sure the depend file exists // make sure the depend file exists
if (!cmSystemTools::FileExists(dependFileNameFull.c_str())) if (!cmSystemTools::FileExists(dependFileNameFull.c_str()))
{ {
@ -192,7 +192,7 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
// rules may depend on this file itself. // rules may depend on this file itself.
this->FlagFileNameFull = this->TargetBuildDirectoryFull; this->FlagFileNameFull = this->TargetBuildDirectoryFull;
this->FlagFileNameFull += "/flags.make"; this->FlagFileNameFull += "/flags.make";
this->FlagFileStream = this->FlagFileStream =
new cmGeneratedFileStream(this->FlagFileNameFull.c_str()); new cmGeneratedFileStream(this->FlagFileNameFull.c_str());
this->FlagFileStream->SetCopyIfDifferent(true); this->FlagFileStream->SetCopyIfDifferent(true);
if(!this->FlagFileStream) if(!this->FlagFileStream)
@ -200,13 +200,13 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
return; return;
} }
this->LocalGenerator->WriteDisclaimer(*this->FlagFileStream); this->LocalGenerator->WriteDisclaimer(*this->FlagFileStream);
// Include the flags for the target. // Include the flags for the target.
*this->BuildFileStream *this->BuildFileStream
<< "# Include the compile flags for this target's objects.\n" << "# Include the compile flags for this target's objects.\n"
<< this->LocalGenerator->IncludeDirective << " " << this->LocalGenerator->IncludeDirective << " "
<< this->Convert(this->FlagFileNameFull.c_str(), << this->Convert(this->FlagFileNameFull.c_str(),
cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::HOME_OUTPUT,
cmLocalGenerator::MAKEFILE) cmLocalGenerator::MAKEFILE)
<< "\n\n"; << "\n\n";
} }
@ -215,10 +215,10 @@ void cmMakefileTargetGenerator::WriteCommonCodeRules()
void cmMakefileTargetGenerator::WriteTargetLanguageFlags() void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
{ {
// write language flags for target // write language flags for target
std::map<cmStdString,cmLocalUnixMakefileGenerator3::IntegrityCheckSet>& std::map<cmStdString,cmLocalUnixMakefileGenerator3::IntegrityCheckSet>&
checkSet = checkSet =
this->LocalGenerator->GetIntegrityCheckSet()[this->Target->GetName()]; this->LocalGenerator->GetIntegrityCheckSet()[this->Target->GetName()];
for(std::map<cmStdString, for(std::map<cmStdString,
cmLocalUnixMakefileGenerator3::IntegrityCheckSet>::const_iterator cmLocalUnixMakefileGenerator3::IntegrityCheckSet>::const_iterator
l = checkSet.begin(); l != checkSet.end(); ++l) l = checkSet.begin(); l != checkSet.end(); ++l)
{ {
@ -230,7 +230,7 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
if(shared) if(shared)
{ {
flags += "-D"; flags += "-D";
if(const char* custom_export_name = if(const char* custom_export_name =
this->Target->GetProperty("DEFINE_SYMBOL")) this->Target->GetProperty("DEFINE_SYMBOL"))
{ {
flags += custom_export_name; flags += custom_export_name;
@ -242,15 +242,15 @@ void cmMakefileTargetGenerator::WriteTargetLanguageFlags()
flags += cmSystemTools::MakeCindentifier(in.c_str()); flags += cmSystemTools::MakeCindentifier(in.c_str());
} }
} }
// Add language-specific flags. // Add language-specific flags.
this->LocalGenerator this->LocalGenerator
->AddLanguageFlags(flags, lang, ->AddLanguageFlags(flags, lang,
this->LocalGenerator->ConfigurationName.c_str()); this->LocalGenerator->ConfigurationName.c_str());
// Add shared-library flags if needed. // Add shared-library flags if needed.
this->LocalGenerator->AddSharedFlags(flags, lang, shared); this->LocalGenerator->AddSharedFlags(flags, lang, shared);
// Add include directory flags. // Add include directory flags.
this->LocalGenerator-> this->LocalGenerator->
AppendFlags(flags, this->LocalGenerator->GetIncludeFlags(lang)); AppendFlags(flags, this->LocalGenerator->GetIncludeFlags(lang));
@ -275,8 +275,8 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source)
// Get the full path name of the object file. // Get the full path name of the object file.
std::string objNoTargetDir; std::string objNoTargetDir;
std::string obj = std::string obj =
this->LocalGenerator->GetObjectFileName(*this->Target, source, this->LocalGenerator->GetObjectFileName(*this->Target, source,
&objNoTargetDir); &objNoTargetDir);
// Avoid generating duplicate rules. // Avoid generating duplicate rules.
@ -290,19 +290,19 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source)
err << "Warning: Source file \"" err << "Warning: Source file \""
<< source.GetSourceName().c_str() << "." << source.GetSourceName().c_str() << "."
<< source.GetSourceExtension().c_str() << source.GetSourceExtension().c_str()
<< "\" is listed multiple times for target \"" << "\" is listed multiple times for target \""
<< this->Target->GetName() << this->Target->GetName()
<< "\"."; << "\".";
cmSystemTools::Message(err.str().c_str(), "Warning"); cmSystemTools::Message(err.str().c_str(), "Warning");
return; return;
} }
// Create the directory containing the object file. This may be a // Create the directory containing the object file. This may be a
// subdirectory under the target's directory. // subdirectory under the target's directory.
std::string dir = cmSystemTools::GetFilenamePath(obj.c_str()); std::string dir = cmSystemTools::GetFilenamePath(obj.c_str());
cmSystemTools::MakeDirectory cmSystemTools::MakeDirectory
(this->LocalGenerator->ConvertToFullPath(dir).c_str()); (this->LocalGenerator->ConvertToFullPath(dir).c_str());
// Save this in the target's list of object files. // Save this in the target's list of object files.
if ( source.GetPropertyAsBool("EXTRA_CONTENT") ) if ( source.GetPropertyAsBool("EXTRA_CONTENT") )
{ {
@ -311,17 +311,18 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source)
this->Objects.push_back(obj); this->Objects.push_back(obj);
// TODO: Remove // TODO: Remove
//std::string relativeObj = this->LocalGenerator->GetHomeRelativeOutputPath(); //std::string relativeObj
//= this->LocalGenerator->GetHomeRelativeOutputPath();
//relativeObj += obj; //relativeObj += obj;
// we compute some depends when writing the depend.make that we will also // we compute some depends when writing the depend.make that we will also
// use in the build.make, same with depMakeFile // use in the build.make, same with depMakeFile
std::vector<std::string> depends; std::vector<std::string> depends;
std::string depMakeFile; std::string depMakeFile;
// generate the build rule file // generate the build rule file
this->WriteObjectBuildFile(obj, lang, source, depends); this->WriteObjectBuildFile(obj, lang, source, depends);
// The object file should be checked for dependency integrity. // The object file should be checked for dependency integrity.
this->LocalGenerator-> this->LocalGenerator->
CheckDependFiles[this->Target->GetName()][lang].insert(&source); CheckDependFiles[this->Target->GetName()][lang].insert(&source);
@ -338,11 +339,11 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles(cmSourceFile& source)
void void
cmMakefileTargetGenerator cmMakefileTargetGenerator
::WriteObjectBuildFile(std::string &obj, ::WriteObjectBuildFile(std::string &obj,
const char *lang, const char *lang,
cmSourceFile& source, cmSourceFile& source,
std::vector<std::string>& depends) std::vector<std::string>& depends)
{ {
this->LocalGenerator->AppendRuleDepend(depends, this->LocalGenerator->AppendRuleDepend(depends,
this->FlagFileNameFull.c_str()); this->FlagFileNameFull.c_str());
// generate the depend scanning rule // generate the depend scanning rule
@ -387,7 +388,7 @@ cmMakefileTargetGenerator
<< "\n" << "\n"
<< "\n"; << "\n";
} }
// Get the output paths for source and object files. // Get the output paths for source and object files.
std::string sourceFile = source.GetFullPath(); std::string sourceFile = source.GetFullPath();
if(this->LocalGenerator->UseRelativePaths) if(this->LocalGenerator->UseRelativePaths)
@ -401,16 +402,16 @@ cmMakefileTargetGenerator
std::string objectFile = this->Convert(obj.c_str(), std::string objectFile = this->Convert(obj.c_str(),
cmLocalGenerator::START_OUTPUT, cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);
// Construct the build message. // Construct the build message.
std::vector<std::string> no_commands; std::vector<std::string> no_commands;
std::vector<std::string> commands; std::vector<std::string> commands;
// add in a progress call if needed // add in a progress call if needed
cmGlobalUnixMakefileGenerator3* gg = cmGlobalUnixMakefileGenerator3* gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator); static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
int prog = gg->ShouldAddProgressRule(); int prog = gg->ShouldAddProgressRule();
std::string progressDir = this->Makefile->GetHomeOutputDirectory(); std::string progressDir = this->Makefile->GetHomeOutputDirectory();
progressDir += cmake::GetCMakeFilesDirectory(); progressDir += cmake::GetCMakeFilesDirectory();
cmOStringStream progCmd; cmOStringStream progCmd;
@ -425,7 +426,7 @@ cmMakefileTargetGenerator
push_back(prog); push_back(prog);
} }
commands.push_back(progCmd.str()); commands.push_back(progCmd.str());
std::string buildEcho = "Building "; std::string buildEcho = "Building ";
buildEcho += lang; buildEcho += lang;
buildEcho += " object "; buildEcho += " object ";
@ -453,13 +454,13 @@ cmMakefileTargetGenerator
vars.Source = sourceFile.c_str(); vars.Source = sourceFile.c_str();
vars.Object = relativeObj.c_str(); vars.Object = relativeObj.c_str();
std::string objdir = this->LocalGenerator->GetHomeRelativeOutputPath(); std::string objdir = this->LocalGenerator->GetHomeRelativeOutputPath();
objdir = this->Convert(objdir.c_str(), objdir = this->Convert(objdir.c_str(),
cmLocalGenerator::START_OUTPUT, cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);
std::string objectDir = cmSystemTools::GetFilenamePath(obj); std::string objectDir = cmSystemTools::GetFilenamePath(obj);
vars.ObjectDir = objectDir.c_str(); vars.ObjectDir = objectDir.c_str();
vars.Flags = flags.c_str(); vars.Flags = flags.c_str();
// Expand placeholders in the commands. // Expand placeholders in the commands.
for(std::vector<std::string>::iterator i = commands.begin(); for(std::vector<std::string>::iterator i = commands.begin();
i != commands.end(); ++i) i != commands.end(); ++i)
@ -470,13 +471,13 @@ cmMakefileTargetGenerator
// Make the target dependency scanning rule include cmake-time-known // Make the target dependency scanning rule include cmake-time-known
// dependencies. The others are handled by the check-build-system // dependencies. The others are handled by the check-build-system
// path. // path.
std::string depMark = std::string depMark =
this->LocalGenerator->GetRelativeTargetDirectory(*this->Target); this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
depMark += "/depend.make.mark"; depMark += "/depend.make.mark";
this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
depMark.c_str(), depMark.c_str(),
depends, no_commands, false); depends, no_commands, false);
// Write the rule. // Write the rule.
this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
relativeObj.c_str(), relativeObj.c_str(),
@ -489,7 +490,7 @@ cmMakefileTargetGenerator
std::vector<std::string> p_depends; std::vector<std::string> p_depends;
// always provide an empty requires target // always provide an empty requires target
this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
objectRequires.c_str(), p_depends, objectRequires.c_str(), p_depends,
no_commands, true); no_commands, true);
// write a build rule to recursively build what this obj provides // write a build rule to recursively build what this obj provides
@ -498,7 +499,7 @@ cmMakefileTargetGenerator
std::string temp = relativeObj; std::string temp = relativeObj;
temp += ".provides.build"; temp += ".provides.build";
std::vector<std::string> r_commands; std::vector<std::string> r_commands;
std::string tgtMakefileName = std::string tgtMakefileName =
this->LocalGenerator->GetRelativeTargetDirectory(*this->Target); this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
tgtMakefileName += "/build.make"; tgtMakefileName += "/build.make";
r_commands.push_back r_commands.push_back
@ -508,9 +509,9 @@ cmMakefileTargetGenerator
p_depends.clear(); p_depends.clear();
p_depends.push_back(objectRequires); p_depends.push_back(objectRequires);
this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
objectProvides.c_str(), p_depends, objectProvides.c_str(), p_depends,
r_commands, true); r_commands, true);
// write the provides.build rule dependency on the obj file // write the provides.build rule dependency on the obj file
p_depends.clear(); p_depends.clear();
p_depends.push_back(relativeObj); p_depends.push_back(relativeObj);
@ -526,7 +527,7 @@ void cmMakefileTargetGenerator::WriteTargetRequiresRules()
std::vector<std::string> no_commands; std::vector<std::string> no_commands;
// Construct the name of the dependency generation target. // Construct the name of the dependency generation target.
std::string depTarget = std::string depTarget =
this->LocalGenerator->GetRelativeTargetDirectory(*this->Target); this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
depTarget += "/requires"; depTarget += "/requires";
@ -555,10 +556,10 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
std::vector<std::string> commands; std::vector<std::string> commands;
// Construct the clean target name. // Construct the clean target name.
std::string cleanTarget = std::string cleanTarget =
this->LocalGenerator->GetRelativeTargetDirectory(*this->Target); this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
cleanTarget += "/clean"; cleanTarget += "/clean";
// Construct the clean command. // Construct the clean command.
this->LocalGenerator->AppendCleanCommand(commands, this->CleanFiles, this->LocalGenerator->AppendCleanCommand(commands, this->CleanFiles,
*this->Target); *this->Target);
@ -566,7 +567,7 @@ void cmMakefileTargetGenerator::WriteTargetCleanRules()
(commands, (commands,
this->Makefile->GetStartOutputDirectory(), this->Makefile->GetStartOutputDirectory(),
this->Makefile->GetHomeOutputDirectory()); this->Makefile->GetHomeOutputDirectory());
// Write the rule. // Write the rule.
this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
cleanTarget.c_str(), cleanTarget.c_str(),
@ -581,9 +582,9 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
std::string dir = this->LocalGenerator->GetTargetDirectory(*this->Target); std::string dir = this->LocalGenerator->GetTargetDirectory(*this->Target);
this->InfoFileNameFull = dir; this->InfoFileNameFull = dir;
this->InfoFileNameFull += "/DependInfo.cmake"; this->InfoFileNameFull += "/DependInfo.cmake";
this->InfoFileNameFull = this->InfoFileNameFull =
this->LocalGenerator->ConvertToFullPath(this->InfoFileNameFull); this->LocalGenerator->ConvertToFullPath(this->InfoFileNameFull);
this->InfoFileStream = this->InfoFileStream =
new cmGeneratedFileStream(this->InfoFileNameFull.c_str()); new cmGeneratedFileStream(this->InfoFileNameFull.c_str());
this->InfoFileStream->SetCopyIfDifferent(true); this->InfoFileStream->SetCopyIfDifferent(true);
if(!*this->InfoFileStream) if(!*this->InfoFileStream)
@ -592,31 +593,31 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
} }
this->LocalGenerator-> this->LocalGenerator->
WriteDependLanguageInfo(*this->InfoFileStream,*this->Target); WriteDependLanguageInfo(*this->InfoFileStream,*this->Target);
// and now write the rule to use it // and now write the rule to use it
std::vector<std::string> depends; std::vector<std::string> depends;
std::vector<std::string> commands; std::vector<std::string> commands;
// Construct the name of the dependency generation target. // Construct the name of the dependency generation target.
std::string depTarget = std::string depTarget =
this->LocalGenerator->GetRelativeTargetDirectory(*this->Target); this->LocalGenerator->GetRelativeTargetDirectory(*this->Target);
depTarget += "/depend"; depTarget += "/depend";
std::string depMark = depTarget; std::string depMark = depTarget;
depMark += ".make.mark"; depMark += ".make.mark";
depends.push_back(depMark); depends.push_back(depMark);
this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
depTarget.c_str(), depTarget.c_str(),
depends, commands, true); depends, commands, true);
depends.clear(); depends.clear();
// Write the dependency generation rule. // Write the dependency generation rule.
std::string depEcho = "Scanning dependencies of target "; std::string depEcho = "Scanning dependencies of target ";
depEcho += this->Target->GetName(); depEcho += this->Target->GetName();
this->LocalGenerator->AppendEcho(commands, depEcho.c_str(), this->LocalGenerator->AppendEcho(commands, depEcho.c_str(),
cmLocalUnixMakefileGenerator3::EchoDepend); cmLocalUnixMakefileGenerator3::EchoDepend);
// Add a command to call CMake to scan dependencies. CMake will // Add a command to call CMake to scan dependencies. CMake will
// touch the corresponding depends file after scanning dependencies. // touch the corresponding depends file after scanning dependencies.
cmOStringStream depCmd; cmOStringStream depCmd;
@ -659,7 +660,7 @@ void cmMakefileTargetGenerator::WriteTargetDependRules()
<< this->Convert(this->InfoFileNameFull.c_str(), << this->Convert(this->InfoFileNameFull.c_str(),
cmLocalGenerator::FULL, cmLocalGenerator::SHELL); cmLocalGenerator::FULL, cmLocalGenerator::SHELL);
commands.push_back(depCmd.str()); commands.push_back(depCmd.str());
// Write the rule. // Write the rule.
this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0, this->LocalGenerator->WriteMakeRule(*this->BuildFileStream, 0,
depMark.c_str(), depMark.c_str(),
@ -700,7 +701,7 @@ void cmMakefileTargetGenerator
cmLocalUnixMakefileGenerator3::EchoGenerate); cmLocalUnixMakefileGenerator3::EchoGenerate);
} }
this->LocalGenerator->AppendCustomCommand(commands, cc); this->LocalGenerator->AppendCustomCommand(commands, cc);
// Collect the dependencies. // Collect the dependencies.
std::vector<std::string> depends; std::vector<std::string> depends;
this->LocalGenerator->AppendCustomDepend(depends, cc); this->LocalGenerator->AppendCustomDepend(depends, cc);
@ -745,16 +746,16 @@ cmMakefileTargetGenerator
{ {
// Write a make variable assignment that lists all objects for the // Write a make variable assignment that lists all objects for the
// target. // target.
variableName = variableName =
this->LocalGenerator->CreateMakeVariable(this->Target->GetName(), this->LocalGenerator->CreateMakeVariable(this->Target->GetName(),
"_OBJECTS"); "_OBJECTS");
*this->BuildFileStream *this->BuildFileStream
<< "# Object files for target " << this->Target->GetName() << "\n" << "# Object files for target " << this->Target->GetName() << "\n"
<< variableName.c_str() << " ="; << variableName.c_str() << " =";
std::string object; std::string object;
const char* objName = const char* objName =
this->Makefile->GetDefinition("CMAKE_NO_QUOTED_OBJECTS"); this->Makefile->GetDefinition("CMAKE_NO_QUOTED_OBJECTS");
const char* lineContinue = const char* lineContinue =
this->Makefile->GetDefinition("CMAKE_MAKE_LINE_CONTINUE"); this->Makefile->GetDefinition("CMAKE_MAKE_LINE_CONTINUE");
if(!lineContinue) if(!lineContinue)
{ {
@ -770,13 +771,13 @@ cmMakefileTargetGenerator
*this->BuildFileStream << " " << lineContinue << "\n"; *this->BuildFileStream << " " << lineContinue << "\n";
if(objName) if(objName)
{ {
*this->BuildFileStream << *this->BuildFileStream <<
this->Convert(i->c_str(), cmLocalGenerator::START_OUTPUT, this->Convert(i->c_str(), cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKEFILE);
} }
else else
{ {
*this->BuildFileStream << *this->BuildFileStream <<
this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str()); this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str());
} }
} }
@ -784,15 +785,15 @@ cmMakefileTargetGenerator
// Write a make variable assignment that lists all external objects // Write a make variable assignment that lists all external objects
// for the target. // for the target.
variableNameExternal = variableNameExternal =
this->LocalGenerator->CreateMakeVariable(this->Target->GetName(), this->LocalGenerator->CreateMakeVariable(this->Target->GetName(),
"_EXTERNAL_OBJECTS"); "_EXTERNAL_OBJECTS");
*this->BuildFileStream *this->BuildFileStream
<< "\n" << "\n"
<< "# External object files for target " << "# External object files for target "
<< this->Target->GetName() << "\n" << this->Target->GetName() << "\n"
<< variableNameExternal.c_str() << " ="; << variableNameExternal.c_str() << " =";
for(std::vector<std::string>::const_iterator i = for(std::vector<std::string>::const_iterator i =
this->ExternalObjects.begin(); this->ExternalObjects.begin();
i != this->ExternalObjects.end(); ++i) i != this->ExternalObjects.end(); ++i)
{ {
@ -802,13 +803,13 @@ cmMakefileTargetGenerator
<< this->Makefile->GetSafeDefinition("CMAKE_OBJECT_NAME"); << this->Makefile->GetSafeDefinition("CMAKE_OBJECT_NAME");
if(objName) if(objName)
{ {
*this->BuildFileStream << *this->BuildFileStream <<
this->Convert(i->c_str(), cmLocalGenerator::START_OUTPUT, this->Convert(i->c_str(), cmLocalGenerator::START_OUTPUT,
cmLocalGenerator::MAKEFILE); cmLocalGenerator::MAKEFILE);
} }
else else
{ {
*this->BuildFileStream << *this->BuildFileStream <<
this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str()); this->LocalGenerator->ConvertToQuotedOutputPath(i->c_str());
} }
} }
@ -898,7 +899,7 @@ void cmMakefileTargetGenerator::WriteTargetDriverRule(const char* main_output,
comment = "Rule to build all files generated by this target."; comment = "Rule to build all files generated by this target.";
// Make sure all custom command outputs in this target are built. // Make sure all custom command outputs in this target are built.
const std::vector<cmSourceFile*>& sources = const std::vector<cmSourceFile*>& sources =
this->Target->GetSourceFiles(); this->Target->GetSourceFiles();
for(std::vector<cmSourceFile*>::const_iterator source = sources.begin(); for(std::vector<cmSourceFile*>::const_iterator source = sources.begin();
source != sources.end(); ++source) source != sources.end(); ++source)
@ -978,7 +979,7 @@ void cmMakefileTargetGenerator
emitted.insert(this->Target->GetName()); emitted.insert(this->Target->GetName());
// Loop over all library dependencies. // Loop over all library dependencies.
const cmTarget::LinkLibraryVectorType& tlibs = const cmTarget::LinkLibraryVectorType& tlibs =
this->Target->GetLinkLibraries(); this->Target->GetLinkLibraries();
for(cmTarget::LinkLibraryVectorType::const_iterator lib = tlibs.begin(); for(cmTarget::LinkLibraryVectorType::const_iterator lib = tlibs.begin();
lib != tlibs.end(); ++lib) lib != tlibs.end(); ++lib)
@ -987,7 +988,7 @@ void cmMakefileTargetGenerator
if(emitted.insert(lib->first).second) if(emitted.insert(lib->first).second)
{ {
// Depend only on other CMake targets. // Depend only on other CMake targets.
if(cmTarget* tgt = if(cmTarget* tgt =
this->GlobalGenerator->FindTarget(0, lib->first.c_str())) this->GlobalGenerator->FindTarget(0, lib->first.c_str()))
{ {
if(const char* location = if(const char* location =
@ -1010,17 +1011,17 @@ void cmMakefileTargetGenerator
} }
void cmMakefileTargetGenerator::RemoveForbiddenFlags(const char* flagVar, void cmMakefileTargetGenerator::RemoveForbiddenFlags(const char* flagVar,
const char* linkLang, const char* linkLang,
std::string& linkFlags) std::string& linkFlags)
{ {
// check for language flags that are not allowed at link time, and // check for language flags that are not allowed at link time, and
// remove them, -w on darwin for gcc -w -dynamiclib sends -w to libtool // remove them, -w on darwin for gcc -w -dynamiclib sends -w to libtool
// which fails, there may be more] // which fails, there may be more]
std::string removeFlags = "CMAKE_"; std::string removeFlags = "CMAKE_";
removeFlags += linkLang; removeFlags += linkLang;
removeFlags += flagVar; removeFlags += flagVar;
std::string removeflags = std::string removeflags =
this->Makefile->GetSafeDefinition(removeFlags.c_str()); this->Makefile->GetSafeDefinition(removeFlags.c_str());
std::vector<std::string> removeList; std::vector<std::string> removeList;
cmSystemTools::ExpandListArgument(removeflags, removeList); cmSystemTools::ExpandListArgument(removeflags, removeList);