diff options
| author | Brad King <brad.king@kitware.com> | 2011-03-31 17:23:23 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-03-31 17:23:23 (GMT) |
| commit | ecc81cd353556af1d9afa3426f0892dd6b92b2b7 (patch) | |
| tree | fdfdb133060c74c92e7226016755854bd159d56e | |
| parent | cddbe63d795d035e49f0dcdb94ee354059a85fbf (diff) | |
| parent | 945f2c2214bc80f513ed08ebe2c8003263a4ee56 (diff) | |
| download | CMake-ecc81cd353556af1d9afa3426f0892dd6b92b2b7.zip CMake-ecc81cd353556af1d9afa3426f0892dd6b92b2b7.tar.gz CMake-ecc81cd353556af1d9afa3426f0892dd6b92b2b7.tar.bz2 | |
Merge topic 'fix_long_filenames_vs2010'
945f2c2 With very long file names, VS 2010 was unable to compile files.
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 11 |
1 files changed, 1 insertions, 10 deletions
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) |