diff options
| author | Brad King <brad.king@kitware.com> | 2016-11-01 13:14:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-11-01 13:14:25 (GMT) |
| commit | 01567fd74f1426ebab2499e5e08d33eff5435f99 (patch) | |
| tree | 231561c97ee64de519383f255a54d0135caf70c2 /Source/cmExtraSublimeTextGenerator.cxx | |
| parent | 9c6cf7fcac1f4f23ec21aeb322026d4f422760cc (diff) | |
| parent | 9a58517df4168a5d928b715fcaa96fc24df9b40c (diff) | |
| download | CMake-01567fd74f1426ebab2499e5e08d33eff5435f99.zip CMake-01567fd74f1426ebab2499e5e08d33eff5435f99.tar.gz CMake-01567fd74f1426ebab2499e5e08d33eff5435f99.tar.bz2 | |
Merge topic 'src-COMPILE_FLAGS-genex'
9a58517d Tests: Add case for Xcode per-config per-source COMPILE_FLAGS diagnostic
1e4bb358 Add generator expression support to per-source COMPILE_FLAGS
Diffstat (limited to 'Source/cmExtraSublimeTextGenerator.cxx')
| -rw-r--r-- | Source/cmExtraSublimeTextGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmExtraSublimeTextGenerator.cxx b/Source/cmExtraSublimeTextGenerator.cxx index ff5036f..9ef684d 100644 --- a/Source/cmExtraSublimeTextGenerator.cxx +++ b/Source/cmExtraSublimeTextGenerator.cxx @@ -373,7 +373,11 @@ std::string cmExtraSublimeTextGenerator::ComputeFlagsForObject( } // Add source file specific flags. - lg->AppendFlags(flags, source->GetProperty("COMPILE_FLAGS")); + if (const char* cflags = source->GetProperty("COMPILE_FLAGS")) { + cmGeneratorExpression ge; + const char* processed = ge.Parse(cflags)->Evaluate(lg, config); + lg->AppendFlags(flags, processed); + } return flags; } |