summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorAlex Neundorf <neundorf@kde.org>2012-09-24 20:06:20 (GMT)
committerBrad King <brad.king@kitware.com>2012-09-30 14:27:44 (GMT)
commit80112da54e1aa8e64f73a2a5a6a4f73431ac6764 (patch)
treeab12483eed9e9950336b4dc511418fd1423d74d1 /Source/cmMakefile.cxx
parent955b96629e05bf2ddb6c94fa7a130e2b5b744782 (diff)
parente83cc94dcd250e90143450bc916353b449043081 (diff)
downloadCMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.zip
CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.tar.gz
CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.tar.bz2
Merge topic 'AutomocUseTargetProperties' into export-sets
Conflicts: Source/cmGlobalGenerator.h
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 9a9c1c8..f067da4 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3984,6 +3984,12 @@ cmTarget* cmMakefile::FindTargetToUse(const char* name)
return this->LocalGenerator->GetGlobalGenerator()->FindTarget(0, name);
}
+cmGeneratorTarget* cmMakefile::FindGeneratorTargetToUse(const char* name)
+{
+ cmTarget *t = this->FindTargetToUse(name);
+ return this->LocalGenerator->GetGlobalGenerator()->GetGeneratorTarget(t);
+}
+
//----------------------------------------------------------------------------
bool cmMakefile::EnforceUniqueName(std::string const& name, std::string& msg,
bool isCustom)