[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3006-g63c484d
Stephen Kelly
steveire at gmail.com
Wed Jul 10 07:15:17 EDT 2013
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 63c484deb1c93b014fe309ffee76adbdb0040672 (commit)
via 6cea063dd68eb1f6dd384134e3cda1014f483c13 (commit)
from 4f2f468b794a1723dc53463ae345f0efc6a09cb0 (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=63c484deb1c93b014fe309ffee76adbdb0040672
commit 63c484deb1c93b014fe309ffee76adbdb0040672
Merge: 4f2f468 6cea063
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 10 07:15:15 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 10 07:15:15 2013 -0400
Merge topic 'compile-defs-debugging' into next
6cea063 Don't input an escaped semicolon.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6cea063dd68eb1f6dd384134e3cda1014f483c13
commit 6cea063dd68eb1f6dd384134e3cda1014f483c13
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jul 10 13:14:42 2013 +0200
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jul 10 13:14:42 2013 +0200
Don't input an escaped semicolon.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 2c9a2ca..0f9e726 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3308,7 +3308,7 @@ static void processCompileOptionsInternal(cmTarget *tgt,
size_t pos = 0;
while((pos = item.find("<SEMICOLON>", pos)) != std::string::npos)
{
- item.replace(pos, 11, "\\;");
+ item.replace(pos, 11, ";");
pos += 2;
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmTarget.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list