[Cmake-commits] CMake branch, next, updated. v3.3.0-1987-g1ee82fb
Brad King
brad.king at kitware.com
Wed Aug 5 13:54:17 EDT 2015
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 1ee82fb5e1e83c43d30cc65c857dcdf81aa313d7 (commit)
via 2eee2943cce2a7aea7a11b93f2459f5f333eb84c (commit)
from abfa7948673c618437c0b9cdaf7588591f334cf2 (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=1ee82fb5e1e83c43d30cc65c857dcdf81aa313d7
commit 1ee82fb5e1e83c43d30cc65c857dcdf81aa313d7
Merge: abfa794 2eee294
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 5 13:54:16 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 5 13:54:16 2015 -0400
Merge topic 'xcode-improve-quoting' into next
2eee2943 Xcode: Invert quoting logic to whitelist of characters
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2eee2943cce2a7aea7a11b93f2459f5f333eb84c
commit 2eee2943cce2a7aea7a11b93f2459f5f333eb84c
Author: Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Aug 2 00:06:49 2015 +0200
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 5 13:51:31 2015 -0400
Xcode: Invert quoting logic to whitelist of characters
Our explicit list of characters that require quoting does not account
for non-ascii characters (e.g. UTF-8) that also need quoting. Invert
the logic to quote a string unless it contains exclusively a set of
characters we whitelist.
diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index ba6e395..c59c360 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -243,7 +243,11 @@ 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_not_of(
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+ "abcdefghijklmnopqrstuvwxyz"
+ "0123456789"
+ "$_./") != String.npos);
const char* quote = needQuote? "\"" : "";
// Print the string, quoted and escaped as necessary.
-----------------------------------------------------------------------
Summary of changes:
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list