diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-16 20:19:11 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-10-22 15:24:39 (GMT) |
| commit | 64afabdbcb265acb53a9b8f8cb86465d31f2ca61 (patch) | |
| tree | ca2616a38a2bf7c80d8635d7fd0f2957645a0a45 /Source/QtDialog/QCMakePreset.cxx | |
| parent | 609122007dc074739b394d2f70f674bbccca6073 (diff) | |
| download | CMake-64afabdbcb265acb53a9b8f8cb86465d31f2ca61.zip CMake-64afabdbcb265acb53a9b8f8cb86465d31f2ca61.tar.gz CMake-64afabdbcb265acb53a9b8f8cb86465d31f2ca61.tar.bz2 | |
CMakePresets.json: Split cmakeGeneratorConfig field
Make this field separate for both architecture and toolset. Allow
architecture and toolset to be either strings or objects with value
and strategy fields.
Fixes: #21317
Diffstat (limited to 'Source/QtDialog/QCMakePreset.cxx')
| -rw-r--r-- | Source/QtDialog/QCMakePreset.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/Source/QtDialog/QCMakePreset.cxx b/Source/QtDialog/QCMakePreset.cxx index b10cf07..176f532 100644 --- a/Source/QtDialog/QCMakePreset.cxx +++ b/Source/QtDialog/QCMakePreset.cxx @@ -6,8 +6,9 @@ bool operator==(const QCMakePreset& lhs, const QCMakePreset& rhs) { return lhs.name == rhs.name && lhs.displayName == rhs.displayName && lhs.description == rhs.description && lhs.generator == rhs.generator && - lhs.architecture == rhs.architecture && lhs.toolset == rhs.toolset && - lhs.setGenConfig == rhs.setGenConfig && lhs.enabled == rhs.enabled; + lhs.architecture == rhs.architecture && + lhs.setArchitecture == rhs.setArchitecture && lhs.toolset == rhs.toolset && + lhs.setToolset == rhs.setToolset && lhs.enabled == rhs.enabled; } bool operator!=(const QCMakePreset& lhs, const QCMakePreset& rhs) @@ -27,11 +28,13 @@ bool operator<(const QCMakePreset& lhs, const QCMakePreset& rhs) (lhs.generator == rhs.generator && (lhs.architecture < rhs.architecture || (lhs.architecture == rhs.architecture && - (lhs.toolset < rhs.toolset || - (lhs.toolset == rhs.toolset && - (lhs.setGenConfig < rhs.setGenConfig || - (lhs.setGenConfig == rhs.setGenConfig && - (lhs.enabled < rhs.enabled)))))))))))))); + (lhs.setArchitecture < rhs.setArchitecture || + (lhs.setArchitecture == rhs.setArchitecture && + (lhs.toolset < rhs.toolset || + (lhs.toolset == rhs.toolset && + (lhs.setToolset < rhs.setToolset || + (lhs.setToolset == rhs.setToolset && + (lhs.enabled < rhs.enabled)))))))))))))))); } bool operator<=(const QCMakePreset& lhs, const QCMakePreset& rhs) |