[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2414-ga2e89c5

[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  a2e89c53e8b5c8a721ff55e2611c0e3ab45ba568 (commit)
       via  29dae292c226abfdbce0314fc5f5d30984bf1e0a (commit)
      from  13904cf9790feea6c8566f85bf2965d0768c588d (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=a2e89c53e8b5c8a721ff55e2611c0e3ab45ba568
commit a2e89c53e8b5c8a721ff55e2611c0e3ab45ba568
Merge: 13904cf 29dae29
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 7 07:25:51 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 7 07:25:51 2013 -0500

    Merge topic 'fix-transitive-target-names' into next
    
    29dae29 Exclude watcom from the new unit test too.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29dae292c226abfdbce0314fc5f5d30984bf1e0a
commit 29dae292c226abfdbce0314fc5f5d30984bf1e0a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Mar 7 13:23:08 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Mar 7 13:23:34 2013 +0100

    Exclude watcom from the new unit test too.
    
     makefile(254): Warning(W18): Unrecognized or out of place character '+'
     makefile(261): Error(E24): More than one command list found for (wrapc)
    
     http://open.cdash.org/testDetails.php?test=180072076&build=2838488

diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index 0309e1d..3881644 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -104,9 +104,9 @@ target_compile_definitions(depG INTERFACE
 
 
 add_executable(targetC targetC.cpp)
-if(NOT BORLAND)
+if(NOT BORLAND AND NOT WATCOM)
   # Linking to a target containing a + should be non-fatal, though it does
-  # not work at all on Borland
+  # not work at all on Borland or watcom
   add_library(wrapc++ empty.cpp)
   target_link_libraries(targetC wrapc++)
 endif()

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

Summary of changes:
 .../target_link_libraries/CMakeLists.txt           |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake