From 375799fa79d1af76f33299acc20a11a167a021f8 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 17 Aug 2023 12:32:50 +0200 Subject: project: restructure libraries and build env --- .vscode/.gitignore | 1 - .vscode/c_cpp_properties.json | 13 ------------- .vscode/settings.json | 13 +++++++++---- .vscode/tasks.json | 33 +++++++++++++++++++++------------ 4 files changed, 30 insertions(+), 30 deletions(-) delete mode 100644 .vscode/.gitignore delete mode 100644 .vscode/c_cpp_properties.json (limited to '.vscode') diff --git a/.vscode/.gitignore b/.vscode/.gitignore deleted file mode 100644 index c5fb070..0000000 --- a/.vscode/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.conan_tools \ No newline at end of file diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json deleted file mode 100644 index 1e50c9d..0000000 --- a/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "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 0f9b893..c811e25 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,10 @@ { - "C_Cpp.autoAddFileAssociations": false, - "C_Cpp.clang_format_style": "file", - "python.terminal.activateEnvironment": true -} \ No newline at end of file + "C_Cpp.intelliSenseEngine": "disabled", + + "cmake.sourceDirectory": "${workspaceFolder}/source", + "cmake.configureOnOpen": false, + "cmake.configureOnEdit": false, + "cmake.skipConfigureIfCachePresent": true, + "cmake.useCMakePresets": "always", + "cmake.mergedCompileCommands": "${workspaceFolder}/compile_commands.json" +} diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 51f98dd..4a14488 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,14 +7,10 @@ "command": "conan", "args": [ "install", - "-if", - "build", - "-pr:b=default", - "-pr:h=default", - "-b", - "missing", - "." - ], + "--build=missing", + "--settings:host=build_type=${input:buildType}", + "${workspaceFolder}/conanfile.py" + ] }, { "label": "conan: build", @@ -22,16 +18,29 @@ "command": "conan", "args": [ "build", - "-if", - "build", - "." + "--build=missing", + "--settings:host=build_type=${input:buildType}", + "${workspaceFolder}/conanfile.py" ], "group": { "kind": "build", "isDefault": true }, - "problemMatcher": "$gcc", "dependsOn": "conan: install" } + ], + "inputs": [ + { + "id": "buildType", + "type": "pickString", + "options": [ + "Debug", + "Release", + "RelWithDebInfo", + "MinSizeRel" + ], + "description": "The desired build type.", + "default": "Debug" + } ] } -- cgit v1.2.3