diff options
author | Brad King <brad.king@kitware.com> | 2018-03-12 15:43:35 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-03-12 17:30:14 (GMT) |
commit | 1b5e52fd651ab17b3f9efb8f3e2e069550bf7a66 (patch) | |
tree | 2d02b554d043337f57a2f34976ce7403b947c877 /Source/cmExportTryCompileFileGenerator.h | |
parent | 2deb9b7f3495a9083b8d5341f867fed615da1470 (diff) | |
download | CMake-1b5e52fd651ab17b3f9efb8f3e2e069550bf7a66.zip CMake-1b5e52fd651ab17b3f9efb8f3e2e069550bf7a66.tar.gz CMake-1b5e52fd651ab17b3f9efb8f3e2e069550bf7a66.tar.bz2 |
Genex: Fix COMPILE_LANGUAGE propagation through try_compile
When evaluating include directories during export to a `try_compile`
test project, thread the compile language through to the generator
expression evaluator so it can support `$<COMPILE_LANGUAGE:...>`.
Issue: #17811
Diffstat (limited to 'Source/cmExportTryCompileFileGenerator.h')
-rw-r--r-- | Source/cmExportTryCompileFileGenerator.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Source/cmExportTryCompileFileGenerator.h b/Source/cmExportTryCompileFileGenerator.h index 70c3857..ca2987c 100644 --- a/Source/cmExportTryCompileFileGenerator.h +++ b/Source/cmExportTryCompileFileGenerator.h @@ -21,7 +21,8 @@ class cmExportTryCompileFileGenerator : public cmExportFileGenerator public: cmExportTryCompileFileGenerator(cmGlobalGenerator* gg, std::vector<std::string> const& targets, - cmMakefile* mf); + cmMakefile* mf, + std::set<std::string> const& langs); /** Set the list of targets to export. */ void SetConfig(const std::string& config) { this->Config = config; } @@ -49,10 +50,12 @@ protected: private: std::string FindTargets(const std::string& prop, const cmGeneratorTarget* tgt, + std::string const& language, std::set<const cmGeneratorTarget*>& emitted); std::vector<cmGeneratorTarget const*> Exports; std::string Config; + std::vector<std::string> Languages; }; #endif |