[Cmake-commits] CMake branch, next, updated. v3.2.2-3191-gdc2b576

[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  dc2b576ac6b353f074ce9a9b3786dc56236c69ca (commit)
       via  092509a458d0a6347e91fd111e8f48e6ac288370 (commit)
      from  9c6f853a5d0a7d93ac22ca2beaabd0e43f277982 (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=dc2b576ac6b353f074ce9a9b3786dc56236c69ca
commit dc2b576ac6b353f074ce9a9b3786dc56236c69ca
Merge: 9c6f853 092509a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 27 08:54:18 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed May 27 08:54:18 2015 -0400

    Merge topic 'imported-interface-libname' into next
    
    092509a4 fixup! Allow imported INTERFACE libraries to specify a link library name


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=092509a458d0a6347e91fd111e8f48e6ac288370
commit 092509a458d0a6347e91fd111e8f48e6ac288370
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed May 27 08:53:56 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed May 27 08:53:56 2015 -0400

    fixup! Allow imported INTERFACE libraries to specify a link library name

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 3fc90c5..ac70138 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5728,7 +5728,7 @@ bool cmTarget::CheckImportedLibName(std::string const& prop,
     if (value[0] == '-')
       {
       this->Makefile->IssueMessage(cmake::FATAL_ERROR, prop +
-        " property value\n  " + value + "\nmay not start in '-'.");
+        " property value\n  " + value + "\nmay not start with '-'.");
       return false;
       }
     std::string::size_type bad = value.find_first_of(":/\\;");
diff --git a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt
index 24f8ea9..454c655 100644
--- a/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt
+++ b/Tests/RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt
@@ -3,7 +3,7 @@
 
     -flag
 
-  may not start in '-'.
+  may not start with '-'.
 Call Stack \(most recent call first\):
   CMakeLists.txt:[0-9]+ \(include\)
 +

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

Summary of changes:
 Source/cmTarget.cxx                                                  |    2 +-
 .../RunCMake/interface_library/IMPORTED_LIBNAME-bad-value-stderr.txt |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake