diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-27 11:49:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-27 11:50:28 (GMT) |
| commit | a6611577c33538af959348b49aec817dd9649c03 (patch) | |
| tree | 788be17486c62f52ca6966fb6640a60592242aa3 /Source/cmGlobalGenerator.h | |
| parent | 7e3d81b1df9e2c192585d83300344546439e50bd (diff) | |
| parent | c84cf42897e4d95706d4f750c2ad085c84a259f2 (diff) | |
| download | CMake-a6611577c33538af959348b49aec817dd9649c03.zip CMake-a6611577c33538af959348b49aec817dd9649c03.tar.gz CMake-a6611577c33538af959348b49aec817dd9649c03.tar.bz2 | |
Merge topic 'cmprop-getglobalprop'
c84cf42897 cmState::GetGlobalProperty: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4521
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 7dc4822..70e43b5 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -588,7 +588,7 @@ protected: cmGeneratorTarget* FindGeneratorTargetImpl(std::string const& name) const; - const char* GetPredefinedTargetsFolder(); + std::string GetPredefinedTargetsFolder(); private: using TargetMap = std::unordered_map<std::string, cmTarget*>; |