diff --git a/src/libs/utils/fileutils.cpp b/src/libs/utils/fileutils.cpp
index 22d855fea3b..98d190e2966 100644
--- a/src/libs/utils/fileutils.cpp
+++ b/src/libs/utils/fileutils.cpp
@@ -62,6 +62,10 @@ bool FileReader::fetch(const FilePath &filePath, QIODevice::OpenMode mode)
         return false;
     }
     m_data = *contents;
+
+    if (mode & QIODevice::Text)
+        m_data = m_data.replace("\r\n", "\n");
+
     return true;
 }
 
diff --git a/src/plugins/cmakeprojectmanager/presetsparser.cpp b/src/plugins/cmakeprojectmanager/presetsparser.cpp
index 06c12de8401..0f9b0c8c8ef 100644
--- a/src/plugins/cmakeprojectmanager/presetsparser.cpp
+++ b/src/plugins/cmakeprojectmanager/presetsparser.cpp
@@ -215,12 +215,24 @@ bool parseConfigurePresets(const QJsonValue &jsonValue,
                 item.key = cacheKey.toUtf8();
                 item.type = CMakeConfigItem::typeStringToType(
                     cacheVariableObj.value("type").toString().toUtf8());
-                item.value = cacheVariableObj.value("type").toString().toUtf8();
+                item.value = cacheVariableObj.value("value").toString().toUtf8();
                 preset.cacheVariables.value() << item;
 
             } else {
-                preset.cacheVariables.value()
-                    << CMakeConfigItem(cacheKey.toUtf8(), cacheValue.toString().toUtf8());
+                if (cacheValue.isBool()) {
+                    preset.cacheVariables.value()
+                        << CMakeConfigItem(cacheKey.toUtf8(),
+                                           CMakeConfigItem::BOOL,
+                                           cacheValue.toBool() ? "ON" : "OFF");
+                } else if (CMakeConfigItem::toBool(cacheValue.toString()).has_value()) {
+                    preset.cacheVariables.value()
+                        << CMakeConfigItem(cacheKey.toUtf8(),
+                                           CMakeConfigItem::BOOL,
+                                           cacheValue.toString().toUtf8());
+                } else {
+                    preset.cacheVariables.value()
+                        << CMakeConfigItem(cacheKey.toUtf8(), cacheValue.toString().toUtf8());
+                }
             }
         }