diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-10-09 20:19:57 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-10-17 15:30:38 (GMT) |
| commit | 3e8ef6427393546c77da1b74234311d3b60edd98 (patch) | |
| tree | dc1463cfd39c1eac2d292700794ac2a32fe54f2b /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | cfb2f7508af637c9c35758fbd5dac6c8cb679bdb (diff) | |
| download | CMake-3e8ef6427393546c77da1b74234311d3b60edd98.zip CMake-3e8ef6427393546c77da1b74234311d3b60edd98.tar.gz CMake-3e8ef6427393546c77da1b74234311d3b60edd98.tar.bz2 | |
cmLocalGenerator: Port some API to cmGeneratorTarget.
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 28b4ab8..2ed5f70 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -115,7 +115,7 @@ void cmMakefileLibraryTargetGenerator::WriteObjectLibraryRules() // Add post-build rules. this->LocalGenerator-> AppendCustomCommands(commands, this->Target->GetPostBuildCommands(), - this->Target); + this->GeneratorTarget); // Depend on the object files. this->AppendObjectDepends(depends); @@ -146,7 +146,7 @@ void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules() std::string extraFlags; this->LocalGenerator->GetStaticLibraryFlags(extraFlags, - cmSystemTools::UpperCase(this->ConfigName), this->Target); + cmSystemTools::UpperCase(this->ConfigName), this->GeneratorTarget); this->WriteLibraryRules(linkRuleVar, extraFlags, false); } @@ -458,10 +458,10 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules { this->LocalGenerator ->AppendCustomCommands(commands, this->Target->GetPreBuildCommands(), - this->Target); + this->GeneratorTarget); this->LocalGenerator ->AppendCustomCommands(commands, this->Target->GetPreLinkCommands(), - this->Target); + this->GeneratorTarget); } // Determine whether a link script will be used. @@ -640,7 +640,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules vars.TargetVersionMinor = targetVersionMinor.c_str(); vars.RuleLauncher = "RULE_LAUNCH_LINK"; - vars.CMTarget = this->Target; + vars.CMTarget = this->GeneratorTarget; vars.Language = linkLanguage.c_str(); vars.Objects = buildObjs.c_str(); std::string objectDir = this->GeneratorTarget->GetSupportDirectory(); @@ -811,7 +811,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules { this->LocalGenerator-> AppendCustomCommands(commands, this->Target->GetPostBuildCommands(), - this->Target); + this->GeneratorTarget); } // Compute the list of outputs. |