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 1549af20a9fbeac6535f6f7134afeb3a4849de74 (commit)
via f7a9ed7e90cd2661b279d0bcd44d43620b8eeda1 (commit)
from 6b24fa692f950a95e500ad3f41c51b9db642afa4 (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=1549af20a9fbeac6535f6f7134afeb3a4849de74
commit 1549af20a9fbeac6535f6f7134afeb3a4849de74
Merge: 6b24fa6 f7a9ed7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jul 31 08:46:47 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 31 08:46:47 2015 -0400
Merge topic 'fix-xcode-quoting' into next
f7a9ed7e Xcode: Quote strings containing a tilde (#15672)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f7a9ed7e90cd2661b279d0bcd44d43620b8eeda1
commit f7a9ed7e90cd2661b279d0bcd44d43620b8eeda1
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Fri Jul 31 13:41:15 2015 +0200
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Jul 31 08:44:27 2015 -0400
Xcode: Quote strings containing a tilde (#15672)
Since commit v3.3.0-rc1~183^2 (Xcode: Refine quoting rules for Strings,
2015-04-09) we no longer quote strings containing a period ('.').
However, file names like "icon29x29~ipad.png" still need quoting because
they contain a tilde ('~'). Add tilde to our explicit list of
characters that need quoting because such file names will no longer
happen to be quoted because they contain a period.
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index e72d315..ba6e395 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -243,7 +243,7 @@ void cmXCodeObject::PrintString(std::ostream&
os,std::string String)
bool needQuote =
(String.empty() ||
String.find("//") != String.npos ||
- String.find_first_of(" <>+-*=@[](){},") != String.npos);
+ String.find_first_of(" <>+-*=@[](){},~") != String.npos);
const char* quote = needQuote? "\"" : "";
// Print the string, quoted and escaped as necessary.
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
