Commit 4cc97fa
authored
* Reimplement #406 with cascading env overrides
* style: format package override env unit test
* style: align env override test with cmake-format layout
* style: apply cmake-format to env override unit test
* feat: warn when CPM_<name>_SOURCE override activates
Reviewer request: add a warning for any overridden dependencies to
minimise the risk of having unexpected dependency versions injected.
Both override paths now emit message(WARNING):
- ENV variable path: fires inside the ENV-fallback block when an
environment variable activates the override
- CMake variable path: fires only when no ENV variable is active,
avoiding a double-warn when ENV sets the CMake variable
Warning format matches CPM_INDENT prefix convention:
"CPM: '<name>' version overridden by environment variable
CPM_<name>_SOURCE='<path>'"
Unit tests updated to capture stderr and assert the expected warning
text is present for both override paths.
* style: apply cmake-format to warning messages
* style: apply cmake-format to package-override-env test
* style: apply cmake-format to package-override test
1 parent af416b9 commit 4cc97fa
5 files changed
Lines changed: 68 additions & 3 deletions
File tree
- cmake
- test/unit
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
260 | 260 | | |
261 | 261 | | |
262 | 262 | | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
263 | 273 | | |
264 | 274 | | |
265 | 275 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
768 | 768 | | |
769 | 769 | | |
770 | 770 | | |
| 771 | + | |
| 772 | + | |
| 773 | + | |
| 774 | + | |
| 775 | + | |
| 776 | + | |
| 777 | + | |
| 778 | + | |
771 | 779 | | |
772 | 780 | | |
773 | 781 | | |
774 | 782 | | |
| 783 | + | |
| 784 | + | |
| 785 | + | |
| 786 | + | |
| 787 | + | |
775 | 788 | | |
776 | 789 | | |
777 | 790 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
9 | 13 | | |
10 | 14 | | |
11 | 15 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
15 | | - | |
16 | | - | |
| 15 | + | |
| 16 | + | |
17 | 17 | | |
| 18 | + | |
18 | 19 | | |
19 | 20 | | |
20 | 21 | | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
0 commit comments