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

cmGeneratorTarget: Avoid recursion in GetOutputName method 

Since support for generator expressions was added to OUTPUT_NAME it is
possible for project code to cause recursion in this method by using a
$<TARGET_FILE> genex.  Detect and reject such cases.
This commit is contained in:
Robert Goulet 2015-08-14 20:35:58 +00:00 committed by Brad King
parent a38ea312c0
commit 3c37d2642d
7 changed files with 72 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Source/cmGeneratorTarget.cxx
View File

@ -270,6 +270,17 @@ const char *cmGeneratorTarget::GetProperty(const std::string& prop) const
std::string cmGeneratorTarget::GetOutputName(const std::string& config,
bool implib) const
{
// Lookup/compute/cache the output name for this configuration.
OutputNameKey key(config, implib);
cmGeneratorTarget::OutputNameMapType::iterator i =
this->OutputNameMap.find(key);
if(i == this->OutputNameMap.end())
{
// Add empty name in map to detect potential recursion.
OutputNameMapType::value_type entry(key, "");
i = this->OutputNameMap.insert(entry).first;
// Compute output name.
std::vector<std::string> props;
std::string type = this->Target->GetOutputTargetType(implib);
std::string configUpper = cmSystemTools::UpperCase(config);
@ -294,10 +305,10 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
props.push_back("OUTPUT_NAME");
std::string outName;
for(std::vector<std::string>::const_iterator i = props.begin();
i != props.end(); ++i)
for(std::vector<std::string>::const_iterator it = props.begin();
it != props.end(); ++it)
{
if (const char* outNameProp = this->Target->GetProperty(*i))
if (const char* outNameProp = this->Target->GetProperty(*it))
{
outName = outNameProp;
break;
@ -309,9 +320,21 @@ std::string cmGeneratorTarget::GetOutputName(const std::string& config,
outName = this->GetName();
}
// Now evaluate genex and update the previously-prepared map entry.
cmGeneratorExpression ge;
cmsys::auto_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(outName);
return cge->Evaluate(this->Makefile, config);
i->second = cge->Evaluate(this->Makefile, config);
}
else if(i->second.empty())
{
// An empty map entry indicates we have been called recursively
// from the above block.
this->Makefile->GetCMakeInstance()->IssueMessage(
cmake::FATAL_ERROR,
"Target '" + this->GetName() + "' OUTPUT_NAME depends on itself.",
this->Target->GetBacktrace());
}
return i->second;
}
//----------------------------------------------------------------------------

4
Source/cmGeneratorTarget.h
View File

@ -375,6 +375,10 @@ private:
};
mutable std::map<std::string, LinkImplClosure> LinkImplClosureMap;
typedef std::pair<std::string, bool> OutputNameKey;
typedef std::map<OutputNameKey, std::string> OutputNameMapType;
mutable OutputNameMapType OutputNameMap;
public:
std::vector<cmTarget const*> const&
GetLinkImplementationClosure(const std::string& config) const;

1
Tests/RunCMake/GeneratorExpression/OUTPUT_NAME-recursion-result.txt Normal file
View File

@ -0,0 +1 @@
1

4
Tests/RunCMake/GeneratorExpression/OUTPUT_NAME-recursion-stderr.txt Normal file
View File

@ -0,0 +1,4 @@
CMake Error at OUTPUT_NAME-recursion.cmake:[0-9]+ \(add_executable\):
Target 'empty1' OUTPUT_NAME depends on itself.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

3
Tests/RunCMake/GeneratorExpression/OUTPUT_NAME-recursion.cmake Normal file
View File

@ -0,0 +1,3 @@
enable_language(C)
add_executable(empty1 empty.c)
set_property(TARGET empty1 PROPERTY OUTPUT_NAME $<TARGET_FILE_NAME:empty1>)

1
Tests/RunCMake/GeneratorExpression/RunCMakeTest.cmake
View File

@ -26,6 +26,7 @@ run_cmake(COMPILE_LANGUAGE-add_library)
run_cmake(COMPILE_LANGUAGE-add_test)
run_cmake(COMPILE_LANGUAGE-unknown-lang)
run_cmake(TARGET_FILE-recursion)
run_cmake(OUTPUT_NAME-recursion)
run_cmake(ImportedTarget-TARGET_PDB_FILE)
if(LINKER_SUPPORTS_PDB)

1
Tests/RunCMake/GeneratorExpression/TARGET_FILE-recursion.cmake
View File

@ -1,3 +1,4 @@
enable_language(C)
add_executable(empty1 empty.c)
set_property(TARGET empty1 PROPERTY OUTPUT_NAME $<TARGET_FILE_NAME:empty1>)
set_property(TARGET empty1 PROPERTY RUNTIME_OUTPUT_DIRECTORY $<TARGET_FILE_DIR:empty1>)