Browse Source

Merge topic 'add_custom_command-no-INTERFACE-lib'

2600e923 Disallow INTERFACE libraries with add_custom_command(TARGET).
Brad King 11 years ago
parent
commit
86b003c3c6

+ 2 - 1
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;
       }

+ 8 - 0
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,

+ 1 - 0
Tests/RunCMake/interface_library/RunCMakeTest.cmake

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

+ 1 - 0
Tests/RunCMake/interface_library/add_custom_command-TARGET-result.txt

@@ -0,0 +1 @@
+1

+ 5 - 0
Tests/RunCMake/interface_library/add_custom_command-TARGET-stderr.txt

@@ -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 - 0
Tests/RunCMake/interface_library/add_custom_command-TARGET.cmake

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