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

cmGeneratorTarget: Improve GetCreateRuleVariable API 

Pass the language and configuration to the method so it can return the
complete rule variable name.
This commit is contained in:
Brad King 2014-05-21 09:38:24 -04:00
parent c2eeb08b06
commit 5d12b87b9d
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/cmGeneratorTarget.cxx
View File

@ -943,18 +943,20 @@ void cmGeneratorTarget::GetAppleArchs(const std::string& config,
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
const char* cmGeneratorTarget::GetCreateRuleVariable() const std::string
cmGeneratorTarget::GetCreateRuleVariable(std::string const& lang,
std::string const&) const
{ {
switch(this->GetType()) switch(this->GetType())
{ {
case cmTarget::STATIC_LIBRARY: case cmTarget::STATIC_LIBRARY:
return "_CREATE_STATIC_LIBRARY"; return "CMAKE_" + lang + "_CREATE_STATIC_LIBRARY";
case cmTarget::SHARED_LIBRARY: case cmTarget::SHARED_LIBRARY:
return "_CREATE_SHARED_LIBRARY"; return "CMAKE_" + lang + "_CREATE_SHARED_LIBRARY";
case cmTarget::MODULE_LIBRARY: case cmTarget::MODULE_LIBRARY:
return "_CREATE_SHARED_MODULE"; return "CMAKE_" + lang + "_CREATE_SHARED_MODULE";
case cmTarget::EXECUTABLE: case cmTarget::EXECUTABLE:
return "_LINK_EXECUTABLE"; return "CMAKE_" + lang + "_LINK_EXECUTABLE";
default: default:
break; break;
} }

6
Source/cmGeneratorTarget.h
View File

@ -75,9 +75,9 @@ public:
void GetAppleArchs(const std::string& config, void GetAppleArchs(const std::string& config,
std::vector<std::string>& archVec) const; std::vector<std::string>& archVec) const;
///! Return the rule variable used to create this type of target, /** Return the rule variable used to create this type of target. */
// need to add CMAKE_(LANG) for full name. std::string GetCreateRuleVariable(std::string const& lang,
const char* GetCreateRuleVariable() const; std::string const& config) const;
/** Get the include directories for this target. */ /** Get the include directories for this target. */
std::vector<std::string> GetIncludeDirectories( std::vector<std::string> GetIncludeDirectories(

8
Source/cmLocalGenerator.cxx
View File

@ -657,10 +657,10 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang,
{ {
std::string objs; std::string objs;
std::vector<std::string> objVector; std::vector<std::string> objVector;
std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE");
// Add all the sources outputs to the depends of the target // Add all the sources outputs to the depends of the target
std::vector<cmSourceFile*> classes; std::vector<cmSourceFile*> classes;
target.GetSourceFiles(classes, target.GetSourceFiles(classes, config);
this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"));
for(std::vector<cmSourceFile*>::const_iterator i = classes.begin(); for(std::vector<cmSourceFile*>::const_iterator i = classes.begin();
i != classes.end(); ++i) i != classes.end(); ++i)
{ {
@ -686,9 +686,7 @@ void cmLocalGenerator::AddBuildTargetRule(const std::string& llang,
} }
} }
} }
std::string createRule = "CMAKE_"; std::string createRule = target.GetCreateRuleVariable(llang, config);
createRule += llang;
createRule += target.GetCreateRuleVariable();
bool useWatcomQuote = this->Makefile->IsOn(createRule+"_USE_WATCOM_QUOTE"); bool useWatcomQuote = this->Makefile->IsOn(createRule+"_USE_WATCOM_QUOTE");
std::string targetName = target.Target->GetFullName(); std::string targetName = target.Target->GetFullName();
// Executable : // Executable :

10
Source/cmNinjaNormalTargetGenerator.cxx
View File

@ -314,9 +314,8 @@ cmNinjaNormalTargetGenerator
std::vector<std::string> linkCmds; std::vector<std::string> linkCmds;
cmMakefile* mf = this->GetMakefile(); cmMakefile* mf = this->GetMakefile();
{ {
std::string linkCmdVar = "CMAKE_"; std::string linkCmdVar = this->GetGeneratorTarget()
linkCmdVar += this->TargetLinkLanguage; ->GetCreateRuleVariable(this->TargetLinkLanguage, this->GetConfigName());
linkCmdVar += this->GetGeneratorTarget()->GetCreateRuleVariable();
const char *linkCmd = mf->GetDefinition(linkCmdVar); const char *linkCmd = mf->GetDefinition(linkCmdVar);
if (linkCmd) if (linkCmd)
{ {
@ -451,8 +450,9 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
std::string linkPath; std::string linkPath;
cmGeneratorTarget& genTarget = *this->GetGeneratorTarget(); cmGeneratorTarget& genTarget = *this->GetGeneratorTarget();
std::string createRule = "CMAKE_"; std::string createRule =
createRule += this->TargetLinkLanguage + genTarget.GetCreateRuleVariable(); genTarget.GetCreateRuleVariable(this->TargetLinkLanguage,
this->GetConfigName());
bool useWatcomQuote = mf->IsOn(createRule+"_USE_WATCOM_QUOTE"); bool useWatcomQuote = mf->IsOn(createRule+"_USE_WATCOM_QUOTE");
cmLocalNinjaGenerator& localGen = *this->GetLocalGenerator(); cmLocalNinjaGenerator& localGen = *this->GetLocalGenerator();
localGen.GetTargetFlags(vars["LINK_LIBRARIES"], localGen.GetTargetFlags(vars["LINK_LIBRARIES"],