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 a7f8d7ade9911f128127073a87b04bc68cc8adc9 (commit)
via 3b8329f5bf492e6fd6272dd83928e7e352fa0b29 (commit)
from 0f547e2dc673fcb9d42a26096eff4977d9cb6298 (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=a7f8d7ade9911f128127073a87b04bc68cc8adc9
commit a7f8d7ade9911f128127073a87b04bc68cc8adc9
Merge: 0f547e2 3b8329f
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Feb 3 09:04:40 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Feb 3 09:04:40 2014 -0500
Merge topic 'osx-rpath-unique' into next
3b8329f5 OS X: Fix bug with making unique rpaths.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3b8329f5bf492e6fd6272dd83928e7e352fa0b29
commit 3b8329f5bf492e6fd6272dd83928e7e352fa0b29
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Feb 3 07:03:35 2014 -0700
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Feb 3 07:03:35 2014 -0700
OS X: Fix bug with making unique rpaths.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 556ef05..0c5f35b 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -915,7 +915,7 @@ std::string cmGlobalVisualStudioGenerator::ExpandCFGIntDir(
i = tmp.find(replace, i))
{
tmp.replace(i, replace.size(), config);
- i += (config.size() - replace.size());
+ i += config.size();
}
return tmp;
}
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index 067de38..484b28f 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -3697,14 +3697,14 @@ std::string
cmGlobalXCodeGenerator::ExpandCFGIntDir(const std::string& str,
i = tmp.find(replace1, i))
{
tmp.replace(i, replace1.size(), config);
- i += (config.size() - replace1.size());
+ i += config.size();
}
for(std::string::size_type i = tmp.find(replace2);
i != std::string::npos;
i = tmp.find(replace2, i))
{
tmp.replace(i, replace2.size(), config);
- i += (config.size() - replace2.size());
+ i += config.size();
}
return tmp;
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx | 2 +-
Source/cmGlobalXCodeGenerator.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
