diff options
| author | coavins <me@coavins.org> | 2026-02-25 20:24:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-26 01:24:22 +0000 |
| commit | c2cf154e3e813acb1b298c82f64a61c38e3d16f6 (patch) | |
| tree | 640592c7aeceedfcd8254a52e308f7fda75fd0c7 /.vscode | |
| parent | 0e99b30e914b4baf910318b8ec1b1c9b2cd3aaa1 (diff) | |
Update .vscode and .devcontainer files (#6246)
This commit makes some changes to the dockerfile to make it work again.
We install cmake from source in order to meet the minimum required
version specified in the CMakeLists.txt file. We build the same version
that is installed on the CI runner image.
We also build tinyxml2 from source because we need some cmake files
that are apparently not included in the apt package.
Diffstat (limited to '.vscode')
| -rw-r--r-- | .vscode/tasks.json | 47 |
1 files changed, 37 insertions, 10 deletions
diff --git a/.vscode/tasks.json b/.vscode/tasks.json index be763065e..b3ec8a819 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -9,14 +9,24 @@ "-S", ".", "-B", - "build/x64", + "build-cmake", "-G", - "Visual Studio 17 2022", - "-T", - "v143", - "-A", - "x64" + "Ninja" ], + "windows": { + "args": [ + "-S", + ".", + "-B", + "build/x64", + "-G", + "Visual Studio 17 2022", + "-T", + "v143", + "-A", + "x64" + ] + }, "group": "build", "problemMatcher": [] }, @@ -26,10 +36,19 @@ "command": "cmake", "args": [ "--build", - "./build/x64", + "build-cmake", "--target", - "GenerateSohOtr" + "GenerateSohOtr", + "--parallel" ], + "windows": { + "args": [ + "--build", + "./build/x64", + "--target", + "GenerateSohOtr" + ] + }, "group": "build", "problemMatcher": [] }, @@ -39,8 +58,16 @@ "command": "cmake", "args": [ "--build", - "./build/x64" + "build-cmake", + "--parallel", + "8" ], + "windows": { + "args": [ + "--build", + "./build/x64" + ] + }, "group": { "kind": "build", "isDefault": true @@ -58,4 +85,4 @@ ] } ] -}
\ No newline at end of file +} |