diff options
author | Brad King <brad.king@kitware.com> | 2020-07-14 11:19:25 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2020-07-14 11:20:15 (GMT) |
commit | 35928fa7ca4c2b4cc39c4cf6aaa2059ebb3b86ce (patch) | |
tree | 34d49dde5bc444c7d3e9f999ba91328dfb660ba0 /Source/cmLocalGenerator.h | |
parent | 2455ec9565a570557ba1cf1417d27e6bdcb65614 (diff) | |
parent | 18726ad634d0f182940d45e9f569000cebcc4377 (diff) | |
download | CMake-35928fa7ca4c2b4cc39c4cf6aaa2059ebb3b86ce.zip CMake-35928fa7ca4c2b4cc39c4cf6aaa2059ebb3b86ce.tar.gz CMake-35928fa7ca4c2b4cc39c4cf6aaa2059ebb3b86ce.tar.bz2 |
Merge topic 'getfeature-prop'
18726ad634 GetFeature(): return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5004
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r-- | Source/cmLocalGenerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h index f4781d6..0c51a65 100644 --- a/Source/cmLocalGenerator.h +++ b/Source/cmLocalGenerator.h @@ -20,6 +20,7 @@ #include "cmMessageType.h" #include "cmOutputConverter.h" #include "cmPolicies.h" +#include "cmProperty.h" #include "cmStateSnapshot.h" class cmComputeLinkInformation; @@ -209,8 +210,7 @@ public: void AppendFeatureOptions(std::string& flags, const std::string& lang, const char* feature); - const char* GetFeature(const std::string& feature, - const std::string& config); + cmProp GetFeature(const std::string& feature, const std::string& config); /** \brief Get absolute path to dependency \a name * |