From d255f596cbb31a403f601096a46e7bd59973323d Mon Sep 17 00:00:00 2001
From: Lucien Shaw <myxlc55@outlook.com>
Date: Fri, 6 Feb 2026 17:10:11 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20devcontainer=E9=80=82=E9=85=8DCMakePre?=
 =?UTF-8?q?sets.json=20(#15606)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* build: 添加新的可在linux系统上使用的cmake预设

* chore: 将devcontainer中的部分cmake配置移除

* chore: devcontainer中使用kitware的apt源以安装最新版本cmake
---
 .devcontainer/1/Dockerfile        | 11 +++++++++++
 .devcontainer/1/devcontainer.json |  4 ----
 CMakePresets.json                 | 19 +++++++++++++++++--
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/.devcontainer/1/Dockerfile b/.devcontainer/1/Dockerfile
index 18c8b715db..5132822467 100644
--- a/.devcontainer/1/Dockerfile
+++ b/.devcontainer/1/Dockerfile
@@ -8,6 +8,17 @@ ARG CLANGD_VERSION=20
 ARG PYTHON_VERSION=3.12.11
 ARG NODEJS_VERSION=24
 
+# Add kitware's apt repository (for cmake)
+RUN curl -fsSL https://apt.kitware.com/keys/kitware-archive-latest.asc | sudo gpg --dearmor -o /usr/share/keyrings/kitware-archive-keyring.gpg
+RUN cat <<EOF | sudo tee /etc/apt/sources.list.d/kitware.sources
+Types: deb
+URIs: https://apt.kitware.com/ubuntu
+Suites: $(lsb_release -cs)
+Components: main
+Architectures: $(dpkg --print-architecture)
+Signed-By: /usr/share/keyrings/kitware-archive-keyring.gpg
+EOF
+
 # Install system dependencies
 RUN sudo apt update \
     && sudo apt upgrade -y \
diff --git a/.devcontainer/1/devcontainer.json b/.devcontainer/1/devcontainer.json
index 5ed6a14263..31d5712b0d 100644
--- a/.devcontainer/1/devcontainer.json
+++ b/.devcontainer/1/devcontainer.json
@@ -60,10 +60,6 @@
                 "python.terminal.activateEnvironment": false,
 
                 // CMake settings
-                "cmake.configureSettings": {
-                    "BUILD_DEBUG_DEMO": "ON",
-                    "CMAKE_TOOLCHAIN_FILE": "src/MaaUtils/MaaDeps/cmake/maa-x64-linux-toolchain.cmake"
-                },
                 "cmake.configureOnOpen": false,
 
                 // Performance optimizations
diff --git a/CMakePresets.json b/CMakePresets.json
index 18ccf3fca7..06378d2f66 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -8,7 +8,7 @@
     "configurePresets": [
         {
             "name": "windows",
-            "displayName": "Windows(Visual Studio 18 2026)",
+            "displayName": "Windows (Visual Studio 18 2026)",
             "generator": "Visual Studio 18 2026",
             "binaryDir": "${sourceDir}/build",
             "cacheVariables": {
@@ -20,6 +20,21 @@
                 "lhs": "${hostSystemName}",
                 "rhs": "Windows"
             }
+        },
+        {
+            "name": "linux",
+            "displayName": "Linux x64 (Unix Makefiles)",
+            "generator": "Unix Makefiles",
+            "binaryDir": "${sourceDir}/build",
+            "cacheVariables": {
+                "BUILD_DEBUG_DEMO": "ON",
+                "CMAKE_TOOLCHAIN_FILE": "src/MaaUtils/MaaDeps/cmake/maa-x64-linux-toolchain.cmake"
+            },
+            "condition": {
+                "type": "equals",
+                "lhs": "${hostSystemName}",
+                "rhs": "Linux"
+            }
         }
     ]
-}
\ No newline at end of file
+}