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

Merge topic 'minor-cleanup' 

e2cb3e7 Help: Note that COMPATIBLE_INTERFACE_ properties may be origin-debugged.
41e48c4 Avoid certain actions on IMPORTED targets.
This commit is contained in:
Brad King 2013-12-19 10:13:29 -05:00 committed by CMake Topic Stage
parent aed192d2cd e2cb3e7d43
commit 0845aaddc5
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Help/variable/CMAKE_DEBUG_TARGET_PROPERTIES.rst
View File

@ -5,7 +5,9 @@ Enables tracing output for target properties.
This variable can be populated with a list of properties to generate This variable can be populated with a list of properties to generate
debug output for when evaluating target properties. Currently it can debug output for when evaluating target properties. Currently it can
only be used when evaluating the INCLUDE_DIRECTORIES, only be used when evaluating the :prop_tgt:`INCLUDE_DIRECTORIES`,
COMPILE_DEFINITIONS, COMPILE_OPTIONS and AUTOUIC_OPTIONS target properties. :prop_tgt:`COMPILE_DEFINITIONS`, :prop_tgt:`COMPILE_OPTIONS`, :prop_tgt:`AUTOUIC_OPTIONS`,
In that case, it outputs a backtrace for each entry in the target property. :prop_tgt:`POSITION_INDEPENDENT_CODE` target properties and any other property
listed in :prop_tgt:`COMPATIBLE_INTERFACE_STRING` and other ``COMPATIBLE_INTERFACE_``
properties. It outputs an origin for each entry in the target property.
Default is unset. Default is unset.

4
Source/cmGlobalGenerator.cxx
View File

@ -1379,6 +1379,10 @@ void cmGlobalGenerator::ComputeGeneratorTargetObjects()
for(cmGeneratorTargetsType::iterator ti = targets.begin(); for(cmGeneratorTargetsType::iterator ti = targets.begin();
ti != targets.end(); ++ti) ti != targets.end(); ++ti)
{ {
if (ti->second->Target->IsImported())
{
continue;
}
cmGeneratorTarget* gt = ti->second; cmGeneratorTarget* gt = ti->second;
gt->ClassifySources(); gt->ClassifySources();
gt->LookupObjectLibraries(); gt->LookupObjectLibraries();

8
Source/cmLocalGenerator.cxx
View File

@ -261,6 +261,10 @@ void cmLocalGenerator::TraceDependencies()
for(cmGeneratorTargetsType::iterator t = targets.begin(); for(cmGeneratorTargetsType::iterator t = targets.begin();
t != targets.end(); ++t) t != targets.end(); ++t)
{ {
if (t->second->Target->IsImported())
{
continue;
}
t->second->TraceDependencies(); t->second->TraceDependencies();
} }
} }
@ -545,6 +549,10 @@ void cmLocalGenerator::GenerateTargetManifest()
{ {
continue; continue;
} }
if (target.Target->IsImported())
{
continue;
}
if(configNames.empty()) if(configNames.empty())
{ {
target.GenerateTargetManifest(0); target.GenerateTargetManifest(0);