Skip to content

Commit 8699470

Browse files
committed
build: use the same build directory for all presets
1 parent d8d93f6 commit 8699470

File tree

6 files changed

+12
-203
lines changed

6 files changed

+12
-203
lines changed

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ jobs:
143143
144144
- name: Run Python tests
145145
env:
146-
PYTHONPATH: 'python/src:build/${{ matrix.preset }}-python-strict/binding'
146+
PYTHONPATH: 'python/src:build/binding'
147147
run: |
148148
pytest python/tests -v
149149
@@ -153,5 +153,5 @@ jobs:
153153
with:
154154
name: build-logs-${{ matrix.os }}-${{ matrix.compiler }}-${{ matrix.preset }}
155155
path: |
156-
build/${{ matrix.preset }}/
156+
build/
157157
retention-days: 3

.vscode/launch.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

.vscode/settings.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"clangd.arguments": [
66
"--background-index",
77
"--clang-tidy",
8+
"--compile-commands-dir=build",
89
"--completion-style=detailed",
910
"--enable-config",
1011
"--header-insertion=iwyu",
@@ -20,12 +21,7 @@
2021
"cmake.configureOnOpen": true,
2122
"cursorpyright.analysis.extraPaths": [
2223
"python/src",
23-
"build/debug-python/binding",
24-
"build/release-python/binding",
25-
"build/debug-python-no-tests/binding",
26-
"build/release-python-no-tests/binding",
27-
"build/debug-python-strict/binding",
28-
"build/release-python-strict/binding"
24+
"build/binding"
2925
],
3026
"editor.codeActionsOnSave": {
3127
"source.fixAll.clangd": "explicit",

.vscode/tasks.json

Lines changed: 0 additions & 166 deletions
This file was deleted.

CMakePresets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
"description": "Base configuration with common settings",
1313
"hidden": true,
1414
"generator": "Ninja",
15-
"binaryDir": "${sourceDir}/build/${presetName}",
16-
"installDir": "${sourceDir}/install/${presetName}",
15+
"binaryDir": "${sourceDir}/build",
16+
"installDir": "${sourceDir}/install",
1717
"cacheVariables": {},
1818
"condition": {
1919
"type": "anyOf",

README.md

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ cmake --build --preset release
125125
#### Run individual examples
126126

127127
```bash
128-
./build/release/examples/algorithms_example
129-
./build/release/examples/containers_example
130-
./build/release/examples/exceptions_example
131-
./build/release/examples/memory_example
132-
./build/release/examples/random_example
133-
./build/release/examples/shapes_example
128+
./build/examples/algorithms_example
129+
./build/examples/containers_example
130+
./build/examples/exceptions_example
131+
./build/examples/memory_example
132+
./build/examples/random_example
133+
./build/examples/shapes_example
134134
```
135135

136136
#### Run tests
@@ -309,9 +309,6 @@ cpp-demo-project/
309309
│ ├── settings.json # VS Code settings
310310
│ └── tasks.json # VS Code tasks
311311
├── build/ # Build output (generated by CMake)
312-
│ ├── debug/ # Debug build output
313-
│ ├── release/ # Release build output
314-
│ └── [other presets]
315312
├── cmake/ # CMake modules and utilities
316313
│ ├── CompilerWarnings.cmake # Compiler warning configuration
317314
│ ├── Dependencies.cmake # External dependencies configuration

0 commit comments

Comments
 (0)