diff options
| author | Brad King <brad.king@kitware.com> | 2014-03-20 13:22:12 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-03-20 13:22:12 (GMT) |
| commit | 86b003c3c682c3d3ec42d73a183c695f04d0ddb2 (patch) | |
| tree | e1da4ef14a53702fda7cf61333d89d0d14a0405e /Source | |
| parent | 7bf8a549f9074b06d018419f1660573a412f695e (diff) | |
| parent | 2600e923a66a86784f756c7d5b9a8b06c5848576 (diff) | |
| download | CMake-86b003c3c682c3d3ec42d73a183c695f04d0ddb2.zip CMake-86b003c3c682c3d3ec42d73a183c695f04d0ddb2.tar.gz CMake-86b003c3c682c3d3ec42d73a183c695f04d0ddb2.tar.bz2 | |
Merge topic 'add_custom_command-no-INTERFACE-lib'
2600e923 Disallow INTERFACE libraries with add_custom_command(TARGET).
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 3 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index c63de79..c47147c 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -264,7 +264,8 @@ void cmLocalGenerator::TraceDependencies() for(cmGeneratorTargetsType::iterator t = targets.begin(); t != targets.end(); ++t) { - if (t->second->Target->IsImported()) + if (t->second->Target->IsImported() + || t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY) { continue; } diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 58625fb..ad9de60 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -926,6 +926,14 @@ cmMakefile::AddCustomCommandToTarget(const std::string& target, this->IssueMessage(cmake::FATAL_ERROR, e.str()); return; } + if(ti->second.GetType() == cmTarget::INTERFACE_LIBRARY) + { + cmOStringStream e; + e << "Target \"" << target << "\" is an INTERFACE library " + "that may not have PRE_BUILD, PRE_LINK, or POST_BUILD commands."; + this->IssueMessage(cmake::FATAL_ERROR, e.str()); + return; + } // Add the command to the appropriate build step for the target. std::vector<std::string> no_output; cmCustomCommand cc(this, no_output, depends, |