Browse Source

Revert "Don't allow utility or global targets in the LINKED expression."

This reverts commit 9712362b4580fb92394ecf8ff57be186571f4319.
Stephen Kelly 12 years ago
parent
commit
567c8d103e

+ 0 - 8
Source/cmGeneratorExpressionEvaluator.cxx

@@ -759,14 +759,6 @@ private:
       {
       return std::string();
       }
-    if(target->GetType() >= cmTarget::UTILITY &&
-      target->GetType() != cmTarget::UNKNOWN_LIBRARY)
-      {
-      ::reportError(context, content->GetOriginalExpression(),
-                  "Target \"" + item
-                  + "\" is not an executable or library.");
-      return std::string();
-      }
     std::string propertyName = "INTERFACE_" + prop;
     const char *propContent = target->GetProperty(propertyName.c_str());
     if (!propContent)

+ 0 - 1
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadLinked-UtilityTarget-result.txt

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

+ 0 - 8
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadLinked-UtilityTarget-stderr.txt

@@ -1,8 +0,0 @@
-CMake Error at BadLinked-UtilityTarget.cmake:7 \(set_property\):
-  Error evaluating generator expression:
-
-    \$<LINKED:check>
-
-  Target "check" is not an executable or library.
-Call Stack \(most recent call first\):
-  CMakeLists.txt:8 \(include\)

+ 0 - 7
Tests/RunCMake/TargetPropertyGeneratorExpressions/BadLinked-UtilityTarget.cmake

@@ -1,7 +0,0 @@
-
-add_custom_target(check ALL
-  COMMAND ${CMAKE_COMMAND} -E echo check
-)
-
-add_library(foo STATIC empty.cpp)
-set_property(TARGET foo PROPERTY INCLUDE_DIRECTORIES $<LINKED:check>)

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

@@ -16,4 +16,3 @@ run_cmake(BadInvalidName6)
 run_cmake(BadInvalidName7)
 run_cmake(BadInvalidName8)
 run_cmake(BadLinked)
-run_cmake(BadLinked-UtilityTarget)

+ 0 - 1
Tests/RunCMake/TargetPropertyGeneratorExpressions/empty.cpp

@@ -1 +0,0 @@
-// empty