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 a52e9382ed912858423b4683879109900376859b (commit)
via a013d46b49596bccabc9d5741499230ca015ef96 (commit)
from 3385d860ae497fdf9b1a52c7701ec6013ea61c16 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a52e9382ed912858423b4683879109900376859b
commit a52e9382ed912858423b4683879109900376859b
Merge: 3385d86 a013d46
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Oct 21 15:58:06 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Oct 21 15:58:06 2015 -0400
Merge topic 'use-generator-target' into next
a013d46b fixup! Port to GetGeneratorTargets.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a013d46b49596bccabc9d5741499230ca015ef96
commit a013d46b49596bccabc9d5741499230ca015ef96
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Wed Oct 21 21:57:40 2015 +0200
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Wed Oct 21 21:57:40 2015 +0200
fixup! Port to GetGeneratorTargets.
diff --git a/Source/cmGlobalVisualStudioGenerator.cxx
b/Source/cmGlobalVisualStudioGenerator.cxx
index 1d4b36c..8ab2262 100644
--- a/Source/cmGlobalVisualStudioGenerator.cxx
+++ b/Source/cmGlobalVisualStudioGenerator.cxx
@@ -379,7 +379,7 @@ bool cmGlobalVisualStudioGenerator::ComputeTargetDepends()
for(std::vector<cmGeneratorTarget*>::iterator ti = targets.begin();
ti != targets.end(); ++ti)
{
- this->ComputeVSTargetDepends((*ti)->Target);
+ this->ComputeVSTargetDepends(*(*ti)->Target);
}
}
}
diff --git a/Source/cmLocalVisualStudio10Generator.cxx
b/Source/cmLocalVisualStudio10Generator.cxx
index c18fc16..c9d53fe 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -83,9 +83,9 @@ void cmLocalVisualStudio10Generator::Generate()
continue;
}
if(static_cast<cmGlobalVisualStudioGenerator*>(this->GlobalGenerator)
- ->TargetIsFortranOnly((*l)->Target))
+ ->TargetIsFortranOnly(*(*l)->Target))
{
- this->CreateSingleVCProj((*l)->GetName().c_str(),(*l)->Target);
+ this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
}
else
{
diff --git a/Source/cmLocalVisualStudio6Generator.cxx
b/Source/cmLocalVisualStudio6Generator.cxx
index 76ca5b1..773e555 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -98,7 +98,7 @@ void cmLocalVisualStudio6Generator::AddCMakeListsRules()
this->Makefile->GetDefinition("CMAKE_SUPPRESS_REGENERATION");
if (!cmSystemTools::IsOn(suppRegenRule))
{
- this->AddDSPBuildRule((*l)->Target);
+ this->AddDSPBuildRule(*(*l)->Target);
}
}
}
@@ -133,21 +133,21 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
case cmState::STATIC_LIBRARY:
case cmState::OBJECT_LIBRARY:
this->SetBuildType(STATIC_LIBRARY,
- (*l)->GetName().c_str(), (*l)->Target);
+ (*l)->GetName().c_str(), *(*l)->Target);
break;
case cmState::SHARED_LIBRARY:
case cmState::MODULE_LIBRARY:
this->SetBuildType(DLL,
- (*l)->GetName().c_str(), (*l)->Target);
+ (*l)->GetName().c_str(), *(*l)->Target);
break;
case cmState::EXECUTABLE:
this->SetBuildType(EXECUTABLE,
- (*l)->GetName().c_str(), (*l)->Target);
+ (*l)->GetName().c_str(), *(*l)->Target);
break;
case cmState::UTILITY:
case cmState::GLOBAL_TARGET:
this->SetBuildType(UTILITY,
- (*l)->GetName().c_str(), (*l)->Target);
+ (*l)->GetName().c_str(), *(*l)->Target);
break;
case cmState::INTERFACE_LIBRARY:
continue;
@@ -173,7 +173,7 @@ void cmLocalVisualStudio6Generator::OutputDSPFile()
cmSystemTools::Error("Error creating directory: ", dir.c_str());
}
}
- this->CreateSingleDSP((*l)->GetName().c_str(), (*l)->Target);
+ this->CreateSingleDSP((*l)->GetName().c_str(), *(*l)->Target);
}
}
}
diff --git a/Source/cmLocalVisualStudio7Generator.cxx
b/Source/cmLocalVisualStudio7Generator.cxx
index 19f9178..0f39ddb 100644
--- a/Source/cmLocalVisualStudio7Generator.cxx
+++ b/Source/cmLocalVisualStudio7Generator.cxx
@@ -187,7 +187,7 @@ void cmLocalVisualStudio7Generator::WriteProjectFiles()
// so don't build a projectfile for it
if(!(*l)->GetProperty("EXTERNAL_MSPROJECT"))
{
- this->CreateSingleVCProj((*l)->GetName().c_str(), *l);
+ this->CreateSingleVCProj((*l)->GetName().c_str(), *(*l)->Target);
}
}
}
-----------------------------------------------------------------------
Summary of changes:
Source/cmGlobalVisualStudioGenerator.cxx | 2 +-
Source/cmLocalVisualStudio10Generator.cxx | 4 ++--
Source/cmLocalVisualStudio6Generator.cxx | 12 ++++++------
Source/cmLocalVisualStudio7Generator.cxx | 2 +-
4 files changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
