diff --git a/.vscode/settings.json b/.vscode/settings.json index 16b39fa..7b9c336 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -19,9 +19,6 @@ "args": [ ] }, - "cmake.configureSettings": { - "CMAKE_TOOLCHAIN_FILE": "${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - }, "cmake.options.statusBarVisibility": "visible", "cmake.generator": "Ninja", "C_Cpp.default.compileCommands": "${workspaceRoot}/build/compile_commands.json", @@ -31,5 +28,6 @@ "ja": true, "zh-hant": true, "zh-hans": true - } + }, + "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools" } \ No newline at end of file diff --git a/template/.vscode/settings.json b/template/.vscode/settings.json index 16b39fa..979199a 100644 --- a/template/.vscode/settings.json +++ b/template/.vscode/settings.json @@ -19,13 +19,14 @@ "args": [ ] }, - "cmake.configureSettings": { - "CMAKE_TOOLCHAIN_FILE": "${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" - }, + // "cmake.configureSettings": { + // "CMAKE_TOOLCHAIN_FILE": "${env:VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" + // }, "cmake.options.statusBarVisibility": "visible", "cmake.generator": "Ninja", "C_Cpp.default.compileCommands": "${workspaceRoot}/build/compile_commands.json", "C_Cpp.default.cppStandard": "c++17", + "C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools", "editor.inlayHints.enabled": "off", "editor.unicodeHighlight.allowedLocales": { "ja": true,