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 46c28dbc0be50e10c6d39b5066752eb9a0651949 (commit)
via 77b2e6f1d838205550f46501b682895d8b38484e (commit)
from 54f28fe4e985f51edd5fd94f9b2d4e8d2acbd761 (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=46c28dbc0be50e10c6d39b5066752eb9a0651949
commit 46c28dbc0be50e10c6d39b5066752eb9a0651949
Merge: 54f28fe 77b2e6f
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 12 11:25:54 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Feb 12 11:25:54 2014 -0500
Merge topic 'osx-sysroot-escape' into next
77b2e6f1 OS X: Escape path given to -isysroot flag
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=77b2e6f1d838205550f46501b682895d8b38484e
commit 77b2e6f1d838205550f46501b682895d8b38484e
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Feb 12 10:49:10 2014 -0500
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed Feb 12 10:49:10 2014 -0500
OS X: Escape path given to -isysroot flag
Ensure that paths containing spaces or other special characters are
escaped correctly on the command line.
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b8b7035..aca195c 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1972,7 +1972,7 @@ void cmLocalGenerator::AddArchitectureFlags(std::string&
flags,
flags += " ";
flags += sysrootFlag;
flags += " ";
- flags += sysroot;
+ flags += this->Convert(sysroot, NONE, SHELL);
}
if (deploymentTargetFlag && *deploymentTargetFlag &&
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalGenerator.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
