summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorTarget.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-08-21 13:29:02 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-08-21 13:29:02 (GMT)
commitc450686ef20597d43d4f019b315275cc8a6ba4a2 (patch)
tree8f6f507617f4b565c627c01e3273c4e756a438c3 /Source/cmGeneratorTarget.h
parent870d839f0d050e1db117c945d478938db657072e (diff)
parent3c37d2642d9000a2d01bc46ad0ea74a741bdb658 (diff)
downloadCMake-c450686ef20597d43d4f019b315275cc8a6ba4a2.zip
CMake-c450686ef20597d43d4f019b315275cc8a6ba4a2.tar.gz
CMake-c450686ef20597d43d4f019b315275cc8a6ba4a2.tar.bz2
Merge topic 'OUTPUT_NAME-genex-no-recursion'
3c37d264 cmGeneratorTarget: Avoid recursion in GetOutputName method
Diffstat (limited to 'Source/cmGeneratorTarget.h')
-rw-r--r--Source/cmGeneratorTarget.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h
index 68e7a8a..15b3335 100644
--- a/Source/cmGeneratorTarget.h
+++ b/Source/cmGeneratorTarget.h
@@ -375,6 +375,10 @@ private:
};
mutable std::map<std::string, LinkImplClosure> LinkImplClosureMap;
+ typedef std::pair<std::string, bool> OutputNameKey;
+ typedef std::map<OutputNameKey, std::string> OutputNameMapType;
+ mutable OutputNameMapType OutputNameMap;
+
public:
std::vector<cmTarget const*> const&
GetLinkImplementationClosure(const std::string& config) const;