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 45a48d7e23bae2590516118643d592f02f69ff4e (commit)
via da0480be5d8d03c5c5c4f14fbc4e1dcfed532620 (commit)
via 1687060b587ded9e65153280c8ab364b05614b64 (commit)
from d42ee02881817f90451a6fdb0f983ab5fd56a3e5 (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=45a48d7e23bae2590516118643d592f02f69ff4e
commit 45a48d7e23bae2590516118643d592f02f69ff4e
Merge: d42ee02 da0480b
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Fri Jul 31 07:55:18 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jul 31 07:55:18 2015 -0400
Merge topic 'fix-xcode-quoting' into next
da0480be Xcode: Properly quote strings containing a tilde
1687060b CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da0480be5d8d03c5c5c4f14fbc4e1dcfed532620
commit da0480be5d8d03c5c5c4f14fbc4e1dcfed532620
Author: Gregor Jasny <gja...@googlemail.com>
AuthorDate: Fri Jul 31 13:41:15 2015 +0200
Commit: Gregor Jasny <gja...@googlemail.com>
CommitDate: Fri Jul 31 13:46:39 2015 +0200
Xcode: Properly quote strings containing a tilde
During CMake 3.3 development a patch landed in CMake which
made the CMake Xcode generator produce project files just
like Xcode does. Xcode does not quote strings containing a
period. That's why CMake stopped quoting those, too. But
Xcode needs quoting for string with a tilde like
icon29x29~ipad.png which were covered before due to
the containing period.
This fixes CMake bug #15672.
diff --git a/Help/release/dev/fix-xcode-quoting.rst
b/Help/release/dev/fix-xcode-quoting.rst
new file mode 100644
index 0000000..33c47cc
--- /dev/null
+++ b/Help/release/dev/fix-xcode-quoting.rst
@@ -0,0 +1,10 @@
+fix-xcode-quoting
+-----------------
+
+* During CMake 3.3 development a patch landed in CMake which made the
+ CMake Xcode generator produce project files just like Xcode does.
+ Xcode does not quote strings containing a period. That's why CMake
+ stopped quoting those, too. But Xcode needs quoting for string with
+ a tilde like ``icon29x29~ipad.png`` which were covered before due to
+ the containing period. CMake now properly quotes strings containing
+ a tilde.
\ No newline at end of file
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:
Help/release/dev/fix-xcode-quoting.rst | 10 ++++++++++
Source/CMakeVersion.cmake | 2 +-
Source/cmXCodeObject.cxx | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
create mode 100644 Help/release/dev/fix-xcode-quoting.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
