diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-10 13:10:04 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-10 13:10:04 (GMT) |
| commit | 98aafb2ad64daa0617b3a71ec61f692d5aa205ce (patch) | |
| tree | a8309ee5a462fd5b3ee93f33800028360537029e /Source/cmLocalGenerator.h | |
| parent | ff4697fc94d74e8c08d165837add668ccb5a5fad (diff) | |
| parent | d9613b962e2ed5c908850c8a083630f753dac113 (diff) | |
| download | CMake-98aafb2ad64daa0617b3a71ec61f692d5aa205ce.zip CMake-98aafb2ad64daa0617b3a71ec61f692d5aa205ce.tar.gz CMake-98aafb2ad64daa0617b3a71ec61f692d5aa205ce.tar.bz2 | |
Merge topic 'refactor-cmLocalGenerator-flags'
d9613b96 cmLocalGenerator: Move GetFrameworkFlags implementation to private helper
70d3bf85 cmLocalGenerator: Adopt GetFrameworkFlags method
de4ee088 cmCommonTargetGenerator: De-duplicate CMAKE_BUILD_TYPE lookup
Diffstat (limited to 'Source/cmLocalGenerator.h')
| -rw-r--r-- | Source/cmLocalGenerator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index 5ced648..ac2ebce 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -313,6 +313,10 @@ public: std::string& frameworkPath, std::string& linkPath, cmGeneratorTarget* target, bool useWatcomQuote); + std::string GetFrameworkFlags(std::string const& l, + std::string const& config, + cmGeneratorTarget* target); + virtual void ComputeObjectFilenames( std::map<cmSourceFile const*, std::string>& mapping, cmGeneratorTarget const* gt = 0); |