GIT_SILENT: we are qt6 only

KDE · Oct 19, 2023 · a3bd4ef · a3bd4ef
1 parent 01ae2cb
commit a3bd4ef
Showing 1 changed file with 12 additions and 50 deletions.
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -6,24 +6,19 @@
             "displayName": "base preset",
             "generator": "Ninja",
             "binaryDir": "${sourceDir}/build-${presetName}",
-            "installDir": "$env{KF5}",
-            "hidden": true
+            "installDir": "$env{KF6}",
+            "hidden": true,
+            "cacheVariables": {
+                "BUILD_QCH": "ON"
+            }
         },
         {
-            "name": "base-qt6",
-            "displayName": "base preset",
-            "generator": "Ninja",
-            "binaryDir": "${sourceDir}/build-${presetName}",
-            "installDir": "$env{KF6}",
-            "hidden": true
-        },	
-	{
             "name": "dev-mold",
             "displayName": "Build as debug + using mold linker",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
                 "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-		"CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold"
+                "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold"
             },
             "inherits": [
                 "base"
@@ -40,31 +35,6 @@
                 "base"
             ]
         },
-        {
-            "name": "dev-qt6",
-            "displayName": "Build against qt6",
-            "binaryDir": "${sourceDir}/build-qt6",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Debug",
-                "BUILD_WITH_QT6": "ON",
-                "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
-            },
-            "inherits": [
-                "base-qt6"
-            ]
-        },
-        {
-            "name": "release-qt6",
-            "displayName": "Build as release mode.",
-            "cacheVariables": {
-                "CMAKE_BUILD_TYPE": "Release",
-                "BUILD_WITH_QT6": "ON",
-		"BUILD_TESTING": "OFF"
-            },
-            "inherits": [
-                "base-qt6"
-            ]
-        },	
         {
             "name": "asan",
             "displayName": "Build with Asan support.",
@@ -107,7 +77,7 @@
             "displayName": "Build as release mode.",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release",
-		"BUILD_TESTING": "OFF"
+                "BUILD_TESTING": "OFF"
             },
             "inherits": [
                 "base"
@@ -122,14 +92,14 @@
             "inherits": [
                 "base"
             ]
-	},
-	{
+        },
+        {
             "name": "coverage",
             "displayName": "coverage",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Debug",
                 "USE_UNITY_CMAKE_SUPPORT": "OFF",
-                "BUILD_COVERAGE": "ON" 
+                "BUILD_COVERAGE": "ON"
             },
             "inherits": [
                 "base"
@@ -167,18 +137,10 @@
             "name": "dev",
             "configurePreset": "dev"
         },
-	{
+        {
             "name": "dev-mold",
             "configurePreset": "dev-mold"
         },
-        {
-            "name": "dev-qt6",
-            "configurePreset": "dev-qt6"
-        },
-        {       
-            "name": "release-qt6",
-            "configurePreset": "release-qt6"
-        },
         {
             "name": "dev-clang",
             "configurePreset": "dev-clang"
@@ -199,7 +161,7 @@
             "name": "coverage",
             "configurePreset": "coverage"
         },
-	{
+        {
             "name": "asan",
             "configurePreset": "asan"
         },