summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2014-03-26 17:24:33 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2014-03-26 17:24:33 (GMT)
commit9b536b914bd665ea55d3f7c1f3e391a060fb9e0e (patch)
tree38868db034be68602a2d0c255d7e70a4784851df
parentbcd4d0ced8a8161822233f66b54b41d388e5fc1c (diff)
parentf1fd3714a40327c461633b64d82f6815ed3e7817 (diff)
downloadCMake-9b536b914bd665ea55d3f7c1f3e391a060fb9e0e.zip
CMake-9b536b914bd665ea55d3f7c1f3e391a060fb9e0e.tar.gz
CMake-9b536b914bd665ea55d3f7c1f3e391a060fb9e0e.tar.bz2
Merge topic 'report-INTERFACE-type-in-conflict'
f1fd3714 cmMakefile: Report type of INTERFACE library in conflict.
-rw-r--r--Source/cmMakefile.cxx3
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index f82acc8..dce71de 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -4200,6 +4200,9 @@ bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
case cmTarget::UTILITY:
e << "a custom target ";
break;
+ case cmTarget::INTERFACE_LIBRARY:
+ e << "an interface library ";
+ break;
default: break;
}
e << "created in source directory \""