ENH: Moved cache entry addition into cmMakefile::AddLibrary and AddExecutable so that commands do not have to add it explicitly.
This commit is contained in:
parent
885e37da22
commit
0829faa9e1
|
@ -54,11 +54,6 @@ bool cmAddExecutableCommand::Invoke(std::vector<std::string>& args)
|
|||
std::vector<std::string> srclists(++s, args.end());
|
||||
|
||||
m_Makefile->AddExecutable(args[0].c_str(),srclists);
|
||||
// Add an entry into the cache
|
||||
cmCacheManager::GetInstance()->
|
||||
AddCacheEntry(args[0].c_str(),
|
||||
m_Makefile->GetCurrentOutputDirectory(),
|
||||
"Path to an executable", cmCacheManager::INTERNAL);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -54,12 +54,6 @@ bool cmAddLibraryCommand::Invoke(std::vector<std::string>& args)
|
|||
std::vector<std::string> srclists(++s, args.end());
|
||||
|
||||
m_Makefile->AddLibrary(args[0].c_str(),srclists);
|
||||
|
||||
// Add an entry into the cache
|
||||
cmCacheManager::GetInstance()->
|
||||
AddCacheEntry(args[0].c_str(),
|
||||
m_Makefile->GetCurrentOutputDirectory(),
|
||||
"Path to a library", cmCacheManager::INTERNAL);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -470,6 +470,12 @@ void cmMakefile::AddLibrary(const char* lname, const std::vector<std::string> &s
|
|||
target.SetInAll(true);
|
||||
target.GetSourceLists() = srcs;
|
||||
m_Targets.insert(cmTargets::value_type(lname,target));
|
||||
|
||||
// Add an entry into the cache
|
||||
cmCacheManager::GetInstance()->
|
||||
AddCacheEntry(lname,
|
||||
this->GetCurrentOutputDirectory(),
|
||||
"Path to a library", cmCacheManager::INTERNAL);
|
||||
}
|
||||
|
||||
void cmMakefile::AddExecutable(const char *exeName,
|
||||
|
@ -480,6 +486,12 @@ void cmMakefile::AddExecutable(const char *exeName,
|
|||
target.SetInAll(true);
|
||||
target.GetSourceLists() = srcs;
|
||||
m_Targets.insert(cmTargets::value_type(exeName,target));
|
||||
|
||||
// Add an entry into the cache
|
||||
cmCacheManager::GetInstance()->
|
||||
AddCacheEntry(exeName,
|
||||
this->GetCurrentOutputDirectory(),
|
||||
"Path to an executable", cmCacheManager::INTERNAL);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue