summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-06-25 14:11:50 (GMT)
committerBrad King <brad.king@kitware.com>2015-06-25 14:11:50 (GMT)
commite4a9346dba41252f0f806b33cb026095e03fb00c (patch)
tree337dc07ee2041e3a036817d9f847723e92bdaed3 /Source/cmTarget.h
parent9e5e645ae6081f8c29ef00144f85d69a64d361a0 (diff)
parent30c2e1dd16e061fbabffa35816cb893d81ff0dcf (diff)
downloadCMake-e4a9346dba41252f0f806b33cb026095e03fb00c.zip
CMake-e4a9346dba41252f0f806b33cb026095e03fb00c.tar.gz
CMake-e4a9346dba41252f0f806b33cb026095e03fb00c.tar.bz2
Merge branch 'fix-target_link_libraries-wrong-dir' into release
Diffstat (limited to 'Source/cmTarget.h')
-rw-r--r--Source/cmTarget.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmTarget.h b/Source/cmTarget.h
index 2150b83..3eb9e7e 100644
--- a/Source/cmTarget.h
+++ b/Source/cmTarget.h
@@ -207,7 +207,8 @@ public:
KeywordTLLSignature,
PlainTLLSignature
};
- bool PushTLLCommandTrace(TLLSignature signature);
+ bool PushTLLCommandTrace(TLLSignature signature,
+ cmListFileContext const& lfc);
void GetTllSignatureTraces(std::ostringstream &s, TLLSignature sig) const;
void MergeLinkLibraries( cmMakefile& mf, const std::string& selfname,