[Cmake-commits] CMake branch, next, updated. v2.8.3-905-g2a52169

[Brad King]

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  2a521691fe210e7159fe0e5e5f92746268719db2 (commit)
       via  999ce0aa9c3fe2def05bde37ffbff627b2df8235 (commit)
      from  72ffe937885d9ca86be5b35040ead88fa85396c9 (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=2a521691fe210e7159fe0e5e5f92746268719db2
commit 2a521691fe210e7159fe0e5e5f92746268719db2
Merge: 72ffe93 999ce0a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 15 12:23:35 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 15 12:23:35 2010 -0500

    Merge topic 'doc-target_link_libraries-scope' into next
    
    999ce0a Document target_link_libraries target scope (#11058)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=999ce0aa9c3fe2def05bde37ffbff627b2df8235
commit 999ce0aa9c3fe2def05bde37ffbff627b2df8235
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 15 12:18:59 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 15 12:18:59 2010 -0500

    Document target_link_libraries target scope (#11058)
    
    The target_link_libraries command requires its first argument to be a
    target in the current directory.  Document this and update the error
    message to be more specific.  While at it, format the error message with
    a call stack.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9983e5d..1463680 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1364,8 +1364,8 @@ void cmMakefile::AddLinkLibraryForTarget(const char *target,
     cmOStringStream e;
     e << "Attempt to add link library \""
       << lib << "\" to target \""
-      << target << "\" which is not built by this project.";
-    cmSystemTools::Error(e.str().c_str());
+      << target << "\" which is not built in this directory.";
+    this->IssueMessage(cmake::FATAL_ERROR, e.str().c_str());
     }
 }
 
diff --git a/Source/cmTargetLinkLibrariesCommand.h b/Source/cmTargetLinkLibrariesCommand.h
index 43a0d7c..ce57df7 100644
--- a/Source/cmTargetLinkLibrariesCommand.h
+++ b/Source/cmTargetLinkLibrariesCommand.h
@@ -62,6 +62,10 @@ public:
       "  target_link_libraries(<target> [item1 [item2 [...]]]\n"
       "                        [[debug|optimized|general] <item>] ...)\n"
       "Specify libraries or flags to use when linking a given target.  "
+      "The named <target> must have been created in the current directory "
+      "by a command such as add_executable or add_library.  "
+      "The remaining arguments specify library names or flags."
+      "\n"
       "If a library name matches that of another target in the project "
       "a dependency will automatically be added in the build system to make "
       "sure the library being linked is up-to-date before the target links.  "

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

Summary of changes:
 Source/cmMakefile.cxx                 |    4 ++--
 Source/cmTargetLinkLibrariesCommand.h |    4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake