diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-02 15:20:12 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-02 15:20:46 (GMT) |
| commit | e95d274f3031180103ee8c88f51432c8d93a5a02 (patch) | |
| tree | bc4e03e2b8d0a2004bf3ef8f9e9feea0fc002e71 /Source/cmGetCMakePropertyCommand.cxx | |
| parent | 525bd2d5e6b6fef64f7eeee0df331e19f94d9298 (diff) | |
| parent | aba23c747b4a7fb342ae77d67b8b5cfbe9a67c8c (diff) | |
| download | CMake-e95d274f3031180103ee8c88f51432c8d93a5a02.zip CMake-e95d274f3031180103ee8c88f51432c8d93a5a02.tar.gz CMake-e95d274f3031180103ee8c88f51432c8d93a5a02.tar.bz2 | |
Merge topic 'cmprop-makefile'
aba23c747b cmMakefile::GetProperty: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4559
Diffstat (limited to 'Source/cmGetCMakePropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetCMakePropertyCommand.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmGetCMakePropertyCommand.cxx b/Source/cmGetCMakePropertyCommand.cxx index 4a9509b..0480876 100644 --- a/Source/cmGetCMakePropertyCommand.cxx +++ b/Source/cmGetCMakePropertyCommand.cxx @@ -23,13 +23,13 @@ bool cmGetCMakePropertyCommand(std::vector<std::string> const& args, std::string output = "NOTFOUND"; if (args[1] == "VARIABLES") { - if (const char* varsProp = status.GetMakefile().GetProperty("VARIABLES")) { - output = varsProp; + if (cmProp varsProp = status.GetMakefile().GetProperty("VARIABLES")) { + output = *varsProp; } } else if (args[1] == "MACROS") { output.clear(); - if (const char* macrosProp = status.GetMakefile().GetProperty("MACROS")) { - output = macrosProp; + if (cmProp macrosProp = status.GetMakefile().GetProperty("MACROS")) { + output = *macrosProp; } } else if (args[1] == "COMPONENTS") { const std::set<std::string>* components = |