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.
This commit is contained in:
47
.vscode/tasks.json
vendored
47
.vscode/tasks.json
vendored
@@ -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 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user