Merge upstream

This commit is contained in:
Mark Russell
2021-09-16 16:01:25 -04:00
parent f857a757a7
commit 1d43adcdfa
33 changed files with 300 additions and 232 deletions

View File

@@ -98,7 +98,7 @@ The script makes use of the following tools:
After setup you can use cmake as usual:
1. Generate the actual build files (out-of-source builds are strongly recomended):
1. Generate the actual build files (out-of-source builds are strongly recommended):
```commandline
cmake -H. -B"cmake-build" -G "Unix Makefiles"