summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-08 14:58:40 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-08 14:58:40 (GMT)
commitf8241136b42c7e1064ca8764c6fa5e17012127da (patch)
treefcb5064ea98b99e5c4bea0cc9b9ade5863f14b46 /Source/cmLocalGenerator.cxx
parent5c57fdedb19897880e5c13f9a0dd35ad4087565c (diff)
parentce0c303d62941d2b10098b1ec00de3ced8556919 (diff)
downloadCMake-f8241136b42c7e1064ca8764c6fa5e17012127da.zip
CMake-f8241136b42c7e1064ca8764c6fa5e17012127da.tar.gz
CMake-f8241136b42c7e1064ca8764c6fa5e17012127da.tar.bz2
Merge topic 'INTERFACE_LIBRARY-target-type'
ce0c303 install: Teach EXPORT option to handle INTERFACE_LIBRARY targets 435c912 export: Add support for INTERFACE_LIBRARY targets fe73226 Add the INTERFACE_LIBRARY target type.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r--Source/cmLocalGenerator.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index afc04b9..b4cb5bd 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1794,6 +1794,10 @@ void cmLocalGenerator::OutputLinkLibraries(std::string& linkLibraries,
ItemVector const& items = cli.GetItems();
for(ItemVector::const_iterator li = items.begin(); li != items.end(); ++li)
{
+ if(li->Target && li->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
+ {
+ continue;
+ }
if(li->IsPath)
{
linkLibs += this->ConvertToLinkReference(li->Value);
@@ -1997,6 +2001,10 @@ bool cmLocalGenerator::GetRealDependency(const char* inName,
// An object library has no single file on which to depend.
// This was listed to get the target-level dependency.
return false;
+ case cmTarget::INTERFACE_LIBRARY:
+ // An interface library has no file on which to depend.
+ // This was listed to get the target-level dependency.
+ return false;
case cmTarget::UTILITY:
case cmTarget::GLOBAL_TARGET:
// A utility target has no file on which to depend. This was listed