From d22bc7b557d36da41fe88d3188a7cd335c3ccaa0 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 16 Sep 2022 21:33:48 +0200 Subject: wanda: clean up build --- .vscode/.gitignore | 1 + .vscode/c_cpp_properties.json | 13 +++++++++++++ .vscode/settings.json | 17 ----------------- .vscode/tasks.json | 37 ++++++++++++++++++++++++++----------- 4 files changed, 40 insertions(+), 28 deletions(-) create mode 100644 .vscode/.gitignore create mode 100644 .vscode/c_cpp_properties.json (limited to '.vscode') diff --git a/.vscode/.gitignore b/.vscode/.gitignore new file mode 100644 index 0000000..c5fb070 --- /dev/null +++ b/.vscode/.gitignore @@ -0,0 +1 @@ +/.conan_tools \ No newline at end of file diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..1e50c9d --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,13 @@ +{ + "configurations": [ + { + "name": "Release", + "includePath": [ + "${workspaceFolder}/**" + ], + "defines": [], + "compileCommands": "${workspaceFolder}/build/Release/compile_commands.json" + } + ], + "version": 4 +} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 20be1c4..fa60a91 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,21 +1,4 @@ { - "C_Cpp.default.configurationProvider": "go2sh.cmake-integration", - "C_Cpp.default.cppStandard": "c++17", - "C_Cpp.configurationWarnings": "Disabled", "C_Cpp.autoAddFileAssociations": false, "C_Cpp.clang_format_style": "file", - - "cmake.cpptools.guessSourceFileConfigurations": true, - "cmake.cpptools.languageConfiguration.CXX": { - "intelliSenseMode": "gcc-x64", - }, - "cmake.configureArguments": "-DCMAKE_BUILD_TYPE=RelWithDebInfo", - "cmake.buildArguments": "--parallel", - "cmake.default.cacheEntries": [ - { - "name": "CMAKE_INSTALL_PREFIX", - "type": "PATH", - "value": "${env:HOME}/.local" - } - ] } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index dc6c7aa..51f98dd 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -2,21 +2,36 @@ "version": "2.0.0", "tasks": [ { - "label": "install", + "label": "conan: install", "type": "shell", - "command": "cmake", + "command": "conan", "args": [ - "--build", - "${workspaceFolder}/build", - "--target", "install", - "--parallel" + "-if", + "build", + "-pr:b=default", + "-pr:h=default", + "-b", + "missing", + "." ], - "group": "build", - "presentation": { - "reveal": "silent" + }, + { + "label": "conan: build", + "type": "shell", + "command": "conan", + "args": [ + "build", + "-if", + "build", + "." + ], + "group": { + "kind": "build", + "isDefault": true }, - "problemMatcher": "$gcc" + "problemMatcher": "$gcc", + "dependsOn": "conan: install" } ] -} \ No newline at end of file +} -- cgit v1.2.3