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 6b14f9017e2bf851527fbef24dbbb3cea14649d1 (commit) via 945f2c2214bc80f513ed08ebe2c8003263a4ee56 (commit) from 02b69e6f7df2b92a418946094685eb88542e10fa (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=6b14f9017e2bf851527fbef24dbbb3cea14649d1 commit 6b14f9017e2bf851527fbef24dbbb3cea14649d1 Merge: 02b69e6 945f2c2 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Wed Mar 23 15:11:53 2011 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Mar 23 15:11:53 2011 -0400 Merge topic 'fix_long_filenames_vs2010' into next 945f2c2 With very long file names, VS 2010 was unable to compile files. http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=945f2c2214bc80f513ed08ebe2c8003263a4ee56 commit 945f2c2214bc80f513ed08ebe2c8003263a4ee56 Author: Bill Hoffman <bill.hoff...@kitware.com> AuthorDate: Wed Mar 23 15:06:44 2011 -0400 Commit: Bill Hoffman <bill.hoff...@kitware.com> CommitDate: Wed Mar 23 15:06:44 2011 -0400 With very long file names, VS 2010 was unable to compile files. At some point in the past VS 2010 failed some tests with custom commands when relative paths were not used. It seems that those problems have been fixed. However, the relative paths apparently are appended to the current working directoy before vs accesses the file. So, with a long path, relative paths cause it to create a combined path that is too long. diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 8a27ffd..f872838 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -367,10 +367,7 @@ cmVisualStudio10TargetGenerator::WriteCustomRule(cmSourceFile* source, static_cast<cmGlobalVisualStudio7Generator *> (this->GlobalGenerator)->GetConfigurations(); this->WriteString("<CustomBuild Include=\"", 2); - std::string path = - cmSystemTools::RelativePath( - this->Makefile->GetCurrentOutputDirectory(), - sourcePath.c_str()); + std::string path = sourcePath; this->ConvertToWindowsSlash(path); (*this->BuildFileStream ) << path << "\">\n"; for(std::vector<std::string>::iterator i = configs->begin(); @@ -609,9 +606,6 @@ WriteGroupSources(const char* name, const char* filter = sourceGroup.GetFullName(); this->WriteString("<", 2); std::string path = source; - path = cmSystemTools::RelativePath( - this->Makefile->GetCurrentOutputDirectory(), - source.c_str()); this->ConvertToWindowsSlash(path); (*this->BuildFileStream) << name << " Include=\"" << path; @@ -685,9 +679,6 @@ void cmVisualStudio10TargetGenerator::WriteCLSources() bool rc = lang && (strcmp(lang, "RC") == 0); bool idl = ext == "idl"; std::string sourceFile = (*source)->GetFullPath(); - sourceFile = cmSystemTools::RelativePath( - this->Makefile->GetCurrentOutputDirectory(), - sourceFile.c_str()); this->ConvertToWindowsSlash(sourceFile); // output the source file if(header) ----------------------------------------------------------------------- Summary of changes: Source/cmVisualStudio10TargetGenerator.cxx | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits