[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1781-g66e7459

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  66e74593a9f90924b6a909783015b88c5e35c57f (commit)
       via  cf07469e8cc533a62e94b923134abf406f52cafc (commit)
      from  bfca0e4f6bdb3cb58aa5846b657efe2bab8da59b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=66e74593a9f90924b6a909783015b88c5e35c57f
commit 66e74593a9f90924b6a909783015b88c5e35c57f
Merge: bfca0e4 cf07469
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 26 05:12:41 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Jan 26 05:12:41 2013 -0500

    Merge topic 'fix-TARGET_PROPERTY-extraction' into next
    
    cf07469 Fix TARGET_PROPERTY target extractions.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cf07469e8cc533a62e94b923134abf406f52cafc
commit cf07469e8cc533a62e94b923134abf406f52cafc
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Jan 26 11:04:12 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Jan 26 11:11:47 2013 +0100

    Fix TARGET_PROPERTY target extractions.
    
    We need to make sure we can export targets which have content such
    as $<0:$<TARGET_PROPERTY:not_a_target,INTERFACE_INCLUDE_DIRECTORIES>
    
    That means making not finding a target non-fatal here.

diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx
index 96e0aea..63756b1 100644
--- a/Source/cmExportFileGenerator.cxx
+++ b/Source/cmExportFileGenerator.cxx
@@ -367,7 +367,6 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
   std::string::size_type lastPos = pos;
 
   cmMakefile *mf = target->GetMakefile();
-  std::string errorString;
 
   while((pos = input.find("$<TARGET_PROPERTY:", lastPos)) != input.npos)
     {
@@ -388,21 +387,14 @@ cmExportFileGenerator::ResolveTargetsInGeneratorExpression(
     std::string targetName = input.substr(nameStartPos,
                                                 commaPos - nameStartPos);
 
-    if (!this->AddTargetNamespace(targetName, target, missingTargets))
+    if (this->AddTargetNamespace(targetName, target, missingTargets))
       {
-      errorString = "$<TARGET_PROPERTY:" + targetName + ",prop> requires "
-                    "its first parameter to be a reachable target.";
-      break;
+      input.replace(nameStartPos, commaPos - nameStartPos, targetName);
       }
-    input.replace(nameStartPos, commaPos - nameStartPos, targetName);
     lastPos = pos + targetName.size();
     }
-  if (!errorString.empty())
-    {
-    mf->IssueMessage(cmake::FATAL_ERROR, errorString);
-    return;
-    }
 
+  std::string errorString;
   pos = 0;
   lastPos = pos;
   while((pos = input.find("$<TARGET_NAME:", lastPos)) != input.npos)
diff --git a/Tests/ExportImport/Export/CMakeLists.txt b/Tests/ExportImport/Export/CMakeLists.txt
index eecfd6a..3f7206b 100644
--- a/Tests/ExportImport/Export/CMakeLists.txt
+++ b/Tests/ExportImport/Export/CMakeLists.txt
@@ -149,6 +149,8 @@ set_property(TARGET testLibRequired APPEND PROPERTY
     $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired4,INTERFACE_INCLUDE_DIRECTORIES>>
     $<BUILD_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired5,INTERFACE_INCLUDE_DIRECTORIES>>
     $<INSTALL_INTERFACE:$<TARGET_PROPERTY:testLibIncludeRequired6,INTERFACE_INCLUDE_DIRECTORIES>>
+    # Test that the below is non-fatal
+    $<$<TARGET_DEFINED:no_a_target>:$<TARGET_PROPERTY:no_a_target,INTERFACE_INCLUDE_DIRECTORIES>>
 )
 
 set_property(TARGET testLibRequired APPEND PROPERTY

-----------------------------------------------------------------------

Summary of changes:
 Source/cmExportFileGenerator.cxx         |   14 +++-----------
 Tests/ExportImport/Export/CMakeLists.txt |    2 ++
 2 files changed, 5 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake