diff options
| author | Brad King <brad.king@kitware.com> | 2015-03-10 13:12:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-03-10 13:12:34 (GMT) |
| commit | ad6fbb88bbeb4db17f0f060525c638f0b7b01a33 (patch) | |
| tree | 042b3405a12e583fc496c7be6cdd2af53af8c323 /Source/cmLocalGenerator.h | |
| parent | cce9671b4fea099c5109569108bca2dafe92a97e (diff) | |
| parent | 232a6883a1fe480def1743af6d711097b98b026e (diff) | |
| download | CMake-ad6fbb88bbeb4db17f0f060525c638f0b7b01a33.zip CMake-ad6fbb88bbeb4db17f0f060525c638f0b7b01a33.tar.gz CMake-ad6fbb88bbeb4db17f0f060525c638f0b7b01a33.tar.bz2 | |
Merge topic 'target-language-genex'
232a6883 Help: Add release notes for target-language-genex.
9e168941 File(GENERATE): Process genex evaluation files for each language.
b734fa44 Genex: Allow COMPILE_LANGUAGE when processing include directories.
0b945ea9 Genex: Allow COMPILE_LANGUAGE when processing compile definitions.
5c559f11 Genex: Enable use of COMPILE_LANGUAGE for compile options.
e387ce7d Genex: Add a COMPILE_LANGUAGE generator expression.
4a0128f4 VS6: Compute CMAKE_*_FLAGS and COMPILE_DEFINITIONS* only when needed
Diffstat (limited to 'Source/cmLocalGenerator.h')
| -rw-r--r-- | Source/cmLocalGenerator.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index d64ae0f..6cdee42 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -239,7 +239,8 @@ public: const std::string& lang, const std::string& config); void AddCompileDefinitions(std::set<std::string>& defines, cmTarget const* target, - const std::string& config); + const std::string& config, + const std::string& lang); /** Compute the language used to compile the given source file. */ std::string GetSourceFileLanguage(const cmSourceFile& source); |