[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2410-g98bc278

[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  98bc278ef6ef299980e46f21a2b916b7b10793e4 (commit)
       via  531067f69ef8d9e9b49a64a7ddc2bf9baeaa2c54 (commit)
      from  1fa6f9172ebb8db4c8a4f2d2b63aa91ae5d37b50 (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=98bc278ef6ef299980e46f21a2b916b7b10793e4
commit 98bc278ef6ef299980e46f21a2b916b7b10793e4
Merge: 1fa6f91 531067f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 6 16:52:56 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 6 16:52:56 2013 -0500

    Merge topic 'fix-transitive-target-names' into next
    
    531067f Don't test + in target names on Borland.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=531067f69ef8d9e9b49a64a7ddc2bf9baeaa2c54
commit 531067f69ef8d9e9b49a64a7ddc2bf9baeaa2c54
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 6 22:51:39 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 6 22:51:39 2013 +0100

    Don't test + in target names on Borland.
    
    It fails with such target names as it strips the '+':
    
     Fatal: Unable to open file 'WRAPC.LIB'
    
     http://open.cdash.org/testDetails.php?test=179971699&build=2837755

diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index e4cb217..0309e1d 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -102,11 +102,14 @@ target_compile_definitions(depG INTERFACE
     TEST_DEF
 )
 
-# Linking to a target containing a + should be non-fatal.
-add_library(wrapc++ empty.cpp)
 
 add_executable(targetC targetC.cpp)
-target_link_libraries(targetC wrapc++)
+if(NOT BORLAND)
+  # Linking to a target containing a + should be non-fatal, though it does
+  # not work at all on Borland
+  add_library(wrapc++ empty.cpp)
+  target_link_libraries(targetC wrapc++)
+endif()
 # The TARGET_PROPERTY expression is duplicated below to test that there is no
 # shortcutting of the evaluation by returning an empty string.
 set(_exe_test $<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>)

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

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


hooks/post-receive
-- 
CMake