diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2021-03-16 14:14:00 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2021-03-16 14:16:02 (GMT) |
| commit | bc663dc333be2aed47927d12575144e65b1e5f9d (patch) | |
| tree | ebf658365c99ec8520a1d030c0ea28009ddac5ab /Source/cmCMakePresetsFile.h | |
| parent | b9eb3541cf16fd393183e077257f21061d25c521 (diff) | |
| parent | 0cf1b5c5adca7061f5d65eef602eca180c8fecb7 (diff) | |
| download | CMake-bc663dc333be2aed47927d12575144e65b1e5f9d.zip CMake-bc663dc333be2aed47927d12575144e65b1e5f9d.tar.gz CMake-bc663dc333be2aed47927d12575144e65b1e5f9d.tar.bz2 | |
Merge branch 'master' into invalid-configure-preset
Diffstat (limited to 'Source/cmCMakePresetsFile.h')
| -rw-r--r-- | Source/cmCMakePresetsFile.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Source/cmCMakePresetsFile.h b/Source/cmCMakePresetsFile.h index 3067d5e..47c02f0 100644 --- a/Source/cmCMakePresetsFile.h +++ b/Source/cmCMakePresetsFile.h @@ -33,6 +33,7 @@ public: INVALID_MACRO_EXPANSION, BUILD_TEST_PRESETS_UNSUPPORTED, INVALID_CONFIGURE_PRESET, + INSTALL_PREFIX_UNSUPPORTED, }; enum class ArchToolsetStrategy @@ -103,6 +104,7 @@ public: std::string Toolset; cm::optional<ArchToolsetStrategy> ToolsetStrategy; std::string BinaryDir; + std::string InstallDir; std::map<std::string, cm::optional<CacheVariable>> CacheVariables; |