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 32c56747a95cb291064cd0f1ec392467651de19d (commit)
via 625bb62c00eb677d05396bc7d4b3450d22e5fb4e (commit)
from ff923e5b7ab8aabdf2e84efd8942e566d6a946a2 (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=32c56747a95cb291064cd0f1ec392467651de19d
commit 32c56747a95cb291064cd0f1ec392467651de19d
Merge: ff923e5 625bb62
Author: Stephen Kelly <[email protected]>
AuthorDate: Wed Mar 6 11:57:31 2013 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Mar 6 11:57:31 2013 -0500
Merge topic 'fix-transitive-target-names' into next
625bb62 Extend the range of valid target names with the + sign.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=625bb62c00eb677d05396bc7d4b3450d22e5fb4e
commit 625bb62c00eb677d05396bc7d4b3450d22e5fb4e
Author: Stephen Kelly <[email protected]>
AuthorDate: Wed Mar 6 17:26:40 2013 +0100
Commit: Stephen Kelly <[email protected]>
CommitDate: Wed Mar 6 17:56:47 2013 +0100
Extend the range of valid target names with the + sign.
As noted in #13986, this character can commonly be used for target
names, such as those containing 'c++'.
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..e4cb217 100644
--- a/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
+++ b/Tests/CMakeCommands/target_link_libraries/CMakeLists.txt
@@ -102,7 +102,11 @@ 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++)
# 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
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
