diff options
Diffstat (limited to 'Source/cmGlobalCommonGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalCommonGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmGlobalCommonGenerator.cxx b/Source/cmGlobalCommonGenerator.cxx index 24c8944..31ff52f 100644 --- a/Source/cmGlobalCommonGenerator.cxx +++ b/Source/cmGlobalCommonGenerator.cxx @@ -11,12 +11,12 @@ #include "cmGeneratorTarget.h" #include "cmLocalGenerator.h" #include "cmMakefile.h" -#include "cmProperty.h" #include "cmStateDirectory.h" #include "cmStateSnapshot.h" #include "cmStateTypes.h" #include "cmStringAlgorithms.h" #include "cmSystemTools.h" +#include "cmValue.h" #include "cmake.h" cmGlobalCommonGenerator::cmGlobalCommonGenerator(cmake* cm) @@ -48,7 +48,7 @@ cmGlobalCommonGenerator::ComputeDirectoryTargets() const DirectoryTarget::Target t; t.GT = gt.get(); const std::string EXCLUDE_FROM_ALL("EXCLUDE_FROM_ALL"); - if (cmProp exclude = gt->GetProperty(EXCLUDE_FROM_ALL)) { + if (cmValue exclude = gt->GetProperty(EXCLUDE_FROM_ALL)) { for (const std::string& config : configs) { cmGeneratorExpressionInterpreter genexInterpreter(lg.get(), config, gt.get()); @@ -122,6 +122,6 @@ std::string cmGlobalCommonGenerator::GetEditCacheCommand() const cmStateEnums::INTERNAL); } } - cmProp edit_cmd = cm->GetCacheDefinition("CMAKE_EDIT_COMMAND"); + cmValue edit_cmd = cm->GetCacheDefinition("CMAKE_EDIT_COMMAND"); return edit_cmd ? *edit_cmd : std::string(); } |