[Cmake-commits] CMake branch, next, updated. v2.8.10.2-1884-g627bb01
Brad King
brad.king at kitware.com
Sun Feb 3 12:03:34 EST 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 627bb018af5485c6fb7a543829a0c95d12962940 (commit)
via ac953d5d1219194b757da5ef7b37c5d8fbaa5811 (commit)
from 1822848c744dbf9ab978b868d9feea4b929ee712 (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=627bb018af5485c6fb7a543829a0c95d12962940
commit 627bb018af5485c6fb7a543829a0c95d12962940
Merge: 1822848 ac953d5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 3 12:03:33 2013 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 3 12:03:33 2013 -0500
Merge topic 'vs6-rule-files' into next
ac953d5 VS 6: Remove $(IntDir) before making directory
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac953d5d1219194b757da5ef7b37c5d8fbaa5811
commit ac953d5d1219194b757da5ef7b37c5d8fbaa5811
Author: Brad King <brad.king at kitware.com>
AuthorDate: Sun Feb 3 12:02:22 2013 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Sun Feb 3 12:02:22 2013 -0500
VS 6: Remove $(IntDir) before making directory
diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index b6e1906..418eaa4 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -324,10 +324,10 @@ void cmLocalVisualStudio6Generator::WriteDSPFile(std::ostream& fout,
{
if(!cmSystemTools::FileExists(source.c_str()))
{
+ cmSystemTools::ReplaceString(source, "$(IntDir)/", "");
// Make sure the path exists for the file
std::string path = cmSystemTools::GetFilenamePath(source);
cmSystemTools::MakeDirectory(path.c_str());
- cmSystemTools::ReplaceString(source, "$(IntDir)/", "");
#if defined(_WIN32) || defined(__CYGWIN__)
std::ofstream sourceFout(source.c_str(),
std::ios::binary | std::ios::out
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalVisualStudio6Generator.cxx | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list