[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2450-g8384fd2

[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  8384fd2e9af5e6e048b65b09f3e2d4e9740f6b4c (commit)
       via  1bdd1675776e6416b23cc6b308269aeb0831bb2e (commit)
      from  7a7c13f2ce3ba9790b503faadd6b95232dff9aa9 (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=8384fd2e9af5e6e048b65b09f3e2d4e9740f6b4c
commit 8384fd2e9af5e6e048b65b09f3e2d4e9740f6b4c
Merge: 7a7c13f 1bdd167
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 12 13:45:16 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 12 13:45:16 2013 -0400

    Merge topic 'fix-transitive-target-names' into next
    
    1bdd167 Restore support for target names with '+' (#13986)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1bdd1675776e6416b23cc6b308269aeb0831bb2e
commit 1bdd1675776e6416b23cc6b308269aeb0831bb2e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 6 17:26:40 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 12 13:39:11 2013 -0400

    Restore support for target names with '+' (#13986)
    
    Extend the range of valid target names with the + sign.  This character
    can commonly be used for target names, such as those containing 'c++'.
    Add a test but skip it for Borland and Watcom tools which do not support
    the character.
    
    Suggested-By: Benjamin Kloster

diff --git a/Source/cmGeneratorExpression.cxx b/Source/cmGeneratorExpression.cxx
index 7ea58fa..3f59129 100644
--- a/Source/cmGeneratorExpression.cxx
+++ b/Source/cmGeneratorExpression.cxx
@@ -393,7 +393,7 @@ bool cmGeneratorExpression::IsValidTargetName(const std::string &input)
   cmsys::RegularExpression targetNameValidator;
   // The ':' is supported to allow use with IMPORTED targets. At least
   // Qt 4 and 5 IMPORTED targets use ':' as the namespace delimiter.
-  targetNameValidator.compile("^[A-Za-z0-9_.:-]+$");
+  targetNameValidator.compile("^[A-Za-z0-9_.:+-]+$");
 
   return targetNameValidator.find(input.c_str());
 }
diff --git a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
index b13c13d..3881644 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -102,7 +102,14 @@ target_compile_definitions(depG INTERFACE
     TEST_DEF
 )
 
+
 add_executable(targetC targetC.cpp)
+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 or watcom
+  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>)
diff --git a/Tests/CMakeCommands/target_link_libraries/empty.cpp b/Tests/CMakeCommands/target_link_libraries/empty.cpp
new file mode 100644
index 0000000..ab32cf6
--- /dev/null
+++ b/Tests/CMakeCommands/target_link_libraries/empty.cpp
@@ -0,0 +1 @@
+// No content

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

Summary of changes:


hooks/post-receive
-- 
CMake