Skip to content

Commit

Permalink
refactor: Update CMake options adding newly introduced and removing o…
Browse files Browse the repository at this point in the history
…utdated ones
  • Loading branch information
2b-t committed Nov 3, 2024
1 parent 71e3b1d commit cbcb465
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 1 addition & 3 deletions .vscode/c_cpp_properties.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@
{
"name": "Linux",
"includePath": [
"${workspaceFolder}/**",
"${workspaceFolder}/../VTK/**",
"${workspaceFolder}/../VTK-build/**"
"${workspaceFolder}/**"
],
"defines": [],
"compilerPath": "/usr/bin/gcc",
Expand Down
4 changes: 3 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@
"concepts": "cpp",
"numbers": "cpp",
"semaphore": "cpp",
"stop_token": "cpp"
"stop_token": "cpp",
"any": "cpp",
"variant": "cpp"
},
"cmake.configureOnOpen": false
}
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit cbcb465

Please sign in to comment.