diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-13 13:54:09 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-13 13:54:09 (GMT) |
| commit | 7ce354d3acc1b5b572c6c475b1ecc222c1bc12bc (patch) | |
| tree | 323774f8e37a3952bff73047649e8779e2b4b98c /Source/cmLocalGenerator.h | |
| parent | 06ee543c00971cd6d52a41da146fdbc9317fd5f7 (diff) | |
| parent | f62ed322dc0d859f595be5ddeff40904ee478f50 (diff) | |
| download | CMake-7ce354d3acc1b5b572c6c475b1ecc222c1bc12bc.zip CMake-7ce354d3acc1b5b572c6c475b1ecc222c1bc12bc.tar.gz CMake-7ce354d3acc1b5b572c6c475b1ecc222c1bc12bc.tar.bz2 | |
Merge topic 'refactor-cmLocalGenerator-flags'
f62ed322 cmLocalGenerator: Add GetTargetDefines to get all defines for a target
853b1bb4 cmLocalGenerator: Constify AppendDefines and AddCompileDefinitions
Diffstat (limited to 'Source/cmLocalGenerator.h')
| -rw-r--r-- | Source/cmLocalGenerator.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index ac2ebce..55b8794 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -138,13 +138,15 @@ public: * Encode a list of preprocessor definitions for the compiler * command line. */ - void AppendDefines(std::set<std::string>& defines, const char* defines_list); - void AppendDefines(std::set<std::string>& defines, std::string defines_list) + void AppendDefines(std::set<std::string>& defines, + const char* defines_list) const; + void AppendDefines(std::set<std::string>& defines, + std::string defines_list) const { this->AppendDefines(defines, defines_list.c_str()); } void AppendDefines(std::set<std::string>& defines, - const std::vector<std::string>& defines_vec); + const std::vector<std::string>& defines_vec) const; /** * Join a set of defines into a definesString with a space separator. @@ -200,7 +202,7 @@ public: void AddCompileDefinitions(std::set<std::string>& defines, cmGeneratorTarget const* target, const std::string& config, - const std::string& lang); + const std::string& lang) const; std::string GetProjectName() const; @@ -312,6 +314,9 @@ public: std::string& flags, std::string& linkFlags, std::string& frameworkPath, std::string& linkPath, cmGeneratorTarget* target, bool useWatcomQuote); + void GetTargetDefines(cmGeneratorTarget const* target, + std::string const& config, std::string const& lang, + std::set<std::string>& defines) const; std::string GetFrameworkFlags(std::string const& l, std::string const& config, |