[Cmake-commits] CMake branch, next, updated. v2.8.2-559-gb15cf16

[Alexander Neundorf]

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  b15cf1659cb2e06ef0ae17c6b4dc9120522bfbd7 (commit)
       via  6aef6d84d7faa5e5f0e93237f991a8ef134ddff9 (commit)
      from  d77639f694fab0ca53a1f640c9dd3e22fb984887 (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=b15cf1659cb2e06ef0ae17c6b4dc9120522bfbd7
commit b15cf1659cb2e06ef0ae17c6b4dc9120522bfbd7
Merge: d77639f 6aef6d8
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 26 21:57:41 2010 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Aug 26 21:57:41 2010 +0200

    Merge branch 'MakeTargetLinkLibrariesComplainWhenNoTargetIsUsed' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6aef6d84d7faa5e5f0e93237f991a8ef134ddff9
commit 6aef6d84d7faa5e5f0e93237f991a8ef134ddff9
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Aug 26 21:54:43 2010 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Aug 26 21:54:43 2010 +0200

    Just warn in case of a bad target as only argument for t_l_l()
    
    As discussed on cmake-devel, if target_link_libraries() is called with
    only one argument, and this one argument is not a valid target, just
    print a warning but don't fail, since otherwise probably some existing
    code somewhere might stop building.
    
    Alex

diff --git a/Source/cmTargetLinkLibrariesCommand.cxx b/Source/cmTargetLinkLibrariesCommand.cxx
index 390e39b..e92a8fa 100644
--- a/Source/cmTargetLinkLibrariesCommand.cxx
+++ b/Source/cmTargetLinkLibrariesCommand.cxx
@@ -38,8 +38,18 @@ bool cmTargetLinkLibrariesCommand
     cmOStringStream e;
     e << "Cannot specify link libraries for target \"" << args[0] << "\" "
       << "which is not built by this project.";
-    this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
-    cmSystemTools::SetFatalErrorOccured();
+    // The bad target is the only argument, just warn, don't fail, because
+    // there is probably some code out there which would stop building
+    // otherwise:
+    if (args.size() < 2)
+      {
+      this->Makefile->IssueMessage(cmake::AUTHOR_WARNING, e.str());
+      }
+    else
+      {
+      this->Makefile->IssueMessage(cmake::FATAL_ERROR, e.str());
+      cmSystemTools::SetFatalErrorOccured();
+      }
     return true;
     }
 

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

Summary of changes:
 Source/cmTargetLinkLibrariesCommand.cxx |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake