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 f87ed31ce514b1c1c299c8b5b714c283875a5a80 (commit) via 9d406cdb656740abcc03de8d655e57b4efe8c81b (commit) from 3f18b6c49ac0809e88e54e2a9981cbbfb0a17261 (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=f87ed31ce514b1c1c299c8b5b714c283875a5a80 commit f87ed31ce514b1c1c299c8b5b714c283875a5a80 Merge: 3f18b6c 9d406cd Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Tue Jun 7 09:03:48 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Tue Jun 7 09:03:48 2011 -0400 Merge topic 'fix_vs10_custom_command_rulefiles' into next 9d406cd Fix for bug #11927, external project git clone step always runs vs10. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9d406cdb656740abcc03de8d655e57b4efe8c81b commit 9d406cdb656740abcc03de8d655e57b4efe8c81b Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Tue Jun 7 08:59:03 2011 -0400 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Tue Jun 7 08:59:03 2011 -0400 Fix for bug #11927, external project git clone step always runs vs10. In cmMakefile.cxx GetCMakeCFGInitDirectory is replaced with GetCMakeFilesDirectory for .rule files. In some cases with external projects, that directory will not exist. With vs10 the .rule files must exist or the rule will run with every build. This fix creates the path that the .rule file is in. In addition, it is now a CMake error if the .rule file can not be created. diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 6d2338e..2a4ff92 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -351,6 +351,9 @@ cmVisualStudio10TargetGenerator::WriteCustomRule(cmSourceFile* source, { if(!cmSystemTools::FileExists(sourcePath.c_str())) { + // Make sure the path exists for the file + std::string path = cmSystemTools::GetFilenamePath(sourcePath); + cmSystemTools::MakeDirectory(path.c_str()); std::ofstream fout(sourcePath.c_str()); if(fout) { @@ -358,6 +361,14 @@ cmVisualStudio10TargetGenerator::WriteCustomRule(cmSourceFile* source, fout.flush(); fout.close(); } + else + { + std::string error = "Could not create file: ["; + error += sourcePath; + error += "] "; + cmSystemTools::Error + (error.c_str(), cmSystemTools::GetLastSystemError().c_str()); + } } } cmLocalVisualStudio7Generator* lg = this->LocalGenerator; ----------------------------------------------------------------------- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits