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

Merge branch 'add_custom_command-no-INTERFACE-lib' into release

This commit is contained in:
Brad King 2014-03-19 10:57:04 -04:00
parent aee06336b8 2600e923a6
commit 6a85d624a8
6 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/cmLocalGenerator.cxx
View File

@ -263,7 +263,8 @@ 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()) if (t->second->Target->IsImported()
|| t->second->Target->GetType() == cmTarget::INTERFACE_LIBRARY)
{ {
continue; continue;
} }

8
Source/cmMakefile.cxx
View File

@ -926,6 +926,14 @@ cmMakefile::AddCustomCommandToTarget(const char* target,
this->IssueMessage(cmake::FATAL_ERROR, e.str()); this->IssueMessage(cmake::FATAL_ERROR, e.str());
return; 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. // Add the command to the appropriate build step for the target.
std::vector<std::string> no_output; std::vector<std::string> no_output;
cmCustomCommand cc(this, no_output, depends, cmCustomCommand cc(this, no_output, depends,

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

@ -8,3 +8,4 @@ run_cmake(invalid_signature)
run_cmake(global-interface) run_cmake(global-interface)
run_cmake(genex_link) run_cmake(genex_link)
run_cmake(add_dependencies) run_cmake(add_dependencies)
run_cmake(add_custom_command-TARGET)

1
Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt Normal file
View File

@ -0,0 +1 @@
1

5
Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt Normal file
View File

@ -0,0 +1,5 @@
CMake Error at add_custom_command-TARGET.cmake:4 \(add_custom_command\):
Target "iface" is an INTERFACE library that may not have PRE_BUILD,
PRE_LINK, or POST_BUILD commands.
Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\)

6
Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake Normal file
View File

@ -0,0 +1,6 @@
add_library(iface INTERFACE)
add_custom_command(TARGET iface
COMMAND "${CMAKE_COMMAND}" -E echo test
)