diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-20 14:22:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-20 14:24:32 (GMT) |
| commit | 541e681da26d3f264ad20228b66e6cfdfec83878 (patch) | |
| tree | 50aad156a86eca7b4d8f76fef9c785d926957e50 /Source/cmTarget.cxx | |
| parent | fb8341c35e43d605e4d2ece50dad6428fd9cc45d (diff) | |
| parent | 0e1faa28cbd12d400b876f7a21d91aad5a837196 (diff) | |
| download | CMake-541e681da26d3f264ad20228b66e6cfdfec83878.zip CMake-541e681da26d3f264ad20228b66e6cfdfec83878.tar.gz CMake-541e681da26d3f264ad20228b66e6cfdfec83878.tar.bz2 | |
Merge topic 'split-custom-command-creation'
0e1faa28cb cmMakefile: Separate custom command setup from actual creation
56c204e8eb cmMakefile: Refactor AddCustomCommandOldStyle to be delay friendly
3061dc6ac9 add_custom_command: Add tests for rejecting literal quotes in commands
e893ab94ba cmMakefile: Validate command line for all custom commands
f1e846fdde cmMakefile: Extract custom command validation method
4926ab2454 cmMakefile: Create all generated byproducts as known sources
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3822
Diffstat (limited to 'Source/cmTarget.cxx')
| -rw-r--r-- | Source/cmTarget.cxx | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 8900ebf..c56aa9d 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -695,13 +695,9 @@ std::string cmTargetInternals::ProcessSourceItemCMP0049(const std::string& s) return src; } -cmSourceFile* cmTarget::AddSourceCMP0049(const std::string& s) +std::string cmTarget::GetSourceCMP0049(const std::string& s) { - std::string src = impl->ProcessSourceItemCMP0049(s); - if (!s.empty() && src.empty()) { - return nullptr; - } - return this->AddSource(src); + return impl->ProcessSourceItemCMP0049(s); } struct CreateLocation |