Skip to content

Commit

Permalink
Fix INSTALL.md (fixes #5)
Browse files Browse the repository at this point in the history
  • Loading branch information
JohannesLorenz committed Oct 21, 2023
1 parent 1c46ef3 commit ea4141f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 27 deletions.
20 changes: 9 additions & 11 deletions .github/workflows/c-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Create Build File
run: mkdir build
- name: Going to Build File
run: cd build
- name: Running Cmake
run: cmake -DCOMPILER=clang
- name: make
run: make
- name: make test
run: make test
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Configure
run: mkdir build && cd build && cmake ..
- name: Build
run: cmake --build build
- name: Run tests
run: cmake --build build --target test
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.5)

# settings
project(ringbuffer)
set(DESCRIPTION "a lock free, multi-reader ringbuffer lib")

SET(VERSION_MAJOR "0")
SET(VERSION_MINOR "8")
SET(VERSION_PATCH "9")
SET(VERSION_MINOR "9")
SET(VERSION_PATCH "0")

# options
option(WANT_MLOCK "provide the mlock system call" ON)
Expand Down
24 changes: 11 additions & 13 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,15 @@ In this directory, type:

```sh
mkdir build
cd build
# for a release build using clang (suggested), where /path/to/zynaddsubfx is
# the binary executable for zynaddsubfx
cmake -DCOMPILER=clang \
-DCMAKE_BUILD_TYPE=Release \
..
cd $_
cmake ..
```

The typical options for `cmake` apply, e.g.:

```
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_CXX_COMPILER=clang++
```

# 3 Running
Expand All @@ -36,14 +39,9 @@ make test
# 4 Realtime check with stoat
Make sure stoat is (root-)installed on your disk.

Instead of using the cmake code from above, use
```sh
cmake -DCOMPILER=stoat ..
```

Then, run
For configuring, use
```sh
make stoat_ringbuffer
cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=/usr/local/bin/stoat-compile++ ..
```

The output should prompt a total of 0 errors.
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ See tests.
# 7 Thanks to

In alphabetical order, I thank:
* Harshil-Jani (@Harshil-Jani)
* Martin Pavelek (@he29-net)
* The JACK team for their ringbuffer

Expand Down

0 comments on commit ea4141f

Please sign in to comment.