[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2164-ga4654bb

[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  a4654bb86a47bed11b702e3c09f0d7c77f2d6dff (commit)
       via  8bbab2456eca2be17f5c4a6d870fa8bfdce320fe (commit)
      from  5f8db381d1aba7a10f6599cf71424c0861cc7ce7 (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=a4654bb86a47bed11b702e3c09f0d7c77f2d6dff
commit a4654bb86a47bed11b702e3c09f0d7c77f2d6dff
Merge: 5f8db38 8bbab24
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 18 03:04:00 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 18 03:04:00 2013 -0500

    Merge topic 'try_compile-targets' into next
    
    8bbab24 Add a better error message.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bbab2456eca2be17f5c4a6d870fa8bfdce320fe
commit 8bbab2456eca2be17f5c4a6d870fa8bfdce320fe
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Feb 18 09:02:17 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Feb 18 09:02:17 2013 +0100

    Add a better error message.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index b6d94d5..28485be 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -129,14 +129,16 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
         default:
           this->Makefile->IssueMessage(cmake::FATAL_ERROR,
             "Only libraries may be used as try_compile IMPORTED "
-            "LINK_LIBRARIES");
+            "LINK_LIBRARIES.  Got " + std::string(tgt->GetName()) + " of "
+            "type " + tgt->GetTargetTypeName(tgt->GetType()) + ".");
           return -1;
         }
         if (!tgt->IsImported())
           {
           this->Makefile->IssueMessage(cmake::FATAL_ERROR,
             "Only libraries may be used as try_compile IMPORTED "
-            "LINK_LIBRARIES");
+            "LINK_LIBRARIES.  Got " + std::string(tgt->GetName()) + ", which "
+            "is a non-IMPORTED target.");
           return -1;
           }
         targets.push_back(tgt);

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

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


hooks/post-receive
-- 
CMake