summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio10Generator.cxx
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2015-10-22 16:27:57 (GMT)
committerStephen Kelly <steveire@gmail.com>2015-10-24 07:19:55 (GMT)
commit459c891088c8b2fb8b7cb950878cf7c0579ddb33 (patch)
tree459c848c058f05e0d1d4e3fe8fa702b14f607d55 /Source/cmGlobalVisualStudio10Generator.cxx
parent7f8bb857b8ab714b80acfa6a6e2c34195fabff6f (diff)
downloadCMake-459c891088c8b2fb8b7cb950878cf7c0579ddb33.zip
CMake-459c891088c8b2fb8b7cb950878cf7c0579ddb33.tar.gz
CMake-459c891088c8b2fb8b7cb950878cf7c0579ddb33.tar.bz2
VS10: Port to cmGeneratorTarget.
Diffstat (limited to 'Source/cmGlobalVisualStudio10Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio10Generator.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index 161b532..e568704 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -331,7 +331,7 @@ void cmGlobalVisualStudio10Generator::Generate()
this->cmGlobalVisualStudio8Generator::Generate();
if(this->LongestSource.Length > 0)
{
- cmMakefile* mf = this->LongestSource.Target->GetMakefile();
+ cmLocalGenerator* lg = this->LongestSource.Target->GetLocalGenerator();
std::ostringstream e;
e <<
"The binary and/or source directory paths may be too long to generate "
@@ -346,13 +346,13 @@ void cmGlobalVisualStudio10Generator::Generate()
" " << this->LongestSource.SourceFile->GetFullPath() << "\n"
"This is because some Visual Studio tools would append the relative "
"path to the end of the referencing directory path, as in:\n"
- " " << mf->GetCurrentBinaryDirectory() << "/"
+ " " << lg->GetCurrentBinaryDirectory() << "/"
<< this->LongestSource.SourceRel << "\n"
"and then incorrectly complain that the file does not exist because "
"the path length is too long for some internal buffer or API. "
"To avoid this problem CMake must use a full path for this file "
"which then triggers the VS 10 property dialog bug.";
- mf->IssueMessage(cmake::WARNING, e.str().c_str());
+ lg->IssueMessage(cmake::WARNING, e.str().c_str());
}
}
@@ -591,9 +591,11 @@ cmGlobalVisualStudio10Generator
//----------------------------------------------------------------------------
void cmGlobalVisualStudio10Generator::PathTooLong(
- cmTarget* target, cmSourceFile const* sf, std::string const& sfRel)
+ cmGeneratorTarget *target, cmSourceFile const* sf,
+ std::string const& sfRel)
{
- size_t len = (strlen(target->GetMakefile()->GetCurrentBinaryDirectory()) +
+ size_t len =
+ (strlen(target->GetLocalGenerator()->GetCurrentBinaryDirectory()) +
1 + sfRel.length());
if(len > this->LongestSource.Length)
{