From cbcb465c413e8b489404e083255d4c1ef11ffe6c Mon Sep 17 00:00:00 2001 From: Tobit Flatscher <53856473+2b-t@users.noreply.github.com> Date: Sun, 3 Nov 2024 18:34:02 +0000 Subject: [PATCH] refactor: Update CMake options adding newly introduced and removing outdated ones --- .github/workflows/build.yml | 2 +- .github/workflows/run-tests.yml | 2 +- .vscode/c_cpp_properties.json | 4 +--- .vscode/settings.json | 4 +++- .vscode/tasks.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dfcee25..b0702b8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: - name: Create build folder run: mkdir build - name: Run CMake - run: cmake -B /code/lbt/build -S /code/lbt -D VTK_DIR=/code/lbt/../VTK-build + run: cmake -B /code/lbt/build -S /code/lbt - name: Compile with Make run: make -j $(nproc) -C /code/lbt/build diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index bece450..87579b9 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -21,7 +21,7 @@ jobs: - name: Create build folder run: mkdir build - name: Run CMake - run: cmake -B /code/lbt/build -S /code/lbt -D VTK_DIR=/code/lbt/../VTK-build -D ENABLE_COVERAGE=True + run: cmake -B /code/lbt/build -S /code/lbt -D BUILD_TESTING=on -D ENABLE_COVERAGE=on - name: Compile with Make run: make -j $(nproc) -C /code/lbt/build - name: Run unit tests diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json index 8d46186..8aec26f 100644 --- a/.vscode/c_cpp_properties.json +++ b/.vscode/c_cpp_properties.json @@ -3,9 +3,7 @@ { "name": "Linux", "includePath": [ - "${workspaceFolder}/**", - "${workspaceFolder}/../VTK/**", - "${workspaceFolder}/../VTK-build/**" + "${workspaceFolder}/**" ], "defines": [], "compilerPath": "/usr/bin/gcc", diff --git a/.vscode/settings.json b/.vscode/settings.json index 2cce669..4b05164 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -76,7 +76,9 @@ "concepts": "cpp", "numbers": "cpp", "semaphore": "cpp", - "stop_token": "cpp" + "stop_token": "cpp", + "any": "cpp", + "variant": "cpp" }, "cmake.configureOnOpen": false } \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index b166ca3..ca58b60 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -6,7 +6,7 @@ "detail": "Build workspace", "type": "shell", "command": [ - "cmake -B ${workspaceFolder}/build -S ${workspaceFolder} -D VTK_DIR=${workspaceFolder}/../VTK-build -D ENABLE_COVERAGE=True", + "cmake -B ${workspaceFolder}/build -S ${workspaceFolder} -D BUILD_TESTING=on -D ENABLE_COVERAGE=on", "&& make -j $(nproc) -C ${workspaceFolder}/build" ], "problemMatcher": "$gcc"