[Cmake-commits] CMake branch, next, updated. v3.3.0-1895-gc06c74f

[Gregor Jasny]

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  c06c74f32f5318789bd72ddb41cec9759d6a9339 (commit)
       via  adecd54b8a3e357489c2492898a5594217e4db29 (commit)
       via  c635339b0039d677100f7212ed02d8f0dc3f492d (commit)
      from  e12067e28975b01aca849ee1d55656d3ba23c694 (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=c06c74f32f5318789bd72ddb41cec9759d6a9339
commit c06c74f32f5318789bd72ddb41cec9759d6a9339
Merge: e12067e adecd54
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Aug 4 16:47:05 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 4 16:47:05 2015 -0400

    Merge topic 'fix-xcode-quoting' into next
    
    adecd54b Xcode: Invert quoting logic to whitelist of characters
    c635339b Xcode: quote more characters


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=adecd54b8a3e357489c2492898a5594217e4db29
commit adecd54b8a3e357489c2492898a5594217e4db29
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sun Aug 2 00:06:49 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Aug 2 00:16:39 2015 +0200

    Xcode: Invert quoting logic to whitelist of characters
    
    The problem with the list of characters which triggers quoting
    is that it does not with UTF-8 characters which are not in the
    7 bit table. Therefore the quoting decision is reversed:
    
    Do not quote if all characters found in the string are in the
    whitelist.

diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 4041d26..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.

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c635339b0039d677100f7212ed02d8f0dc3f492d
commit c635339b0039d677100f7212ed02d8f0dc3f492d
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Sat Aug 1 22:30:15 2015 +0200
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Sun Aug 2 00:16:31 2015 +0200

    Xcode: quote more characters

diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index ba6e395..4041d26 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:
 Source/cmXCodeObject.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake