diff options
| author | andrew-elder <aelder@audioscience.com> | 2018-06-11 05:37:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-11 05:37:05 -0700 |
| commit | 506b659d1baca303136205b96e7520503b071092 (patch) | |
| tree | 72e13c4682a16cfd7e799ada850945ff9384546f | |
| parent | 9b96ee647da61ffdf06dad031d06b8b13228e697 (diff) | |
| parent | 66ec2f5ef323868b79008f8d88d28d163411f918 (diff) | |
| download | Open-AVB-506b659d1baca303136205b96e7520503b071092.tar.gz | |
Merge pull request #791 from aguedes/libavtp-build-fixes
Libavtp build fixes
| -rw-r--r-- | lib/libavtp/README.md | 2 | ||||
| -rw-r--r-- | lib/libavtp/meson.build | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/libavtp/README.md b/lib/libavtp/README.md index 4aa025b0..bb099d4c 100644 --- a/lib/libavtp/README.md +++ b/lib/libavtp/README.md @@ -23,7 +23,7 @@ Then build libavtp by running the following command. The building artifacts will be created under the build/ in the top-level directory. ``` -$ ninja -C build +$ ninja -C build/ libavtp.so ``` To install libavtp on your system run: diff --git a/lib/libavtp/meson.build b/lib/libavtp/meson.build index e12b56b5..d282d6ea 100644 --- a/lib/libavtp/meson.build +++ b/lib/libavtp/meson.build @@ -29,12 +29,14 @@ pkg.generate( libraries: avtp_lib, ) +cmockadep = dependency('cmocka', required: false, version: '>=1.1.1') + test_avtp = executable( 'test-avtp', 'unit/test-avtp.c', include_directories: include_directories('include'), link_with: avtp_lib, - dependencies: dependency('cmocka'), + dependencies: cmockadep, build_by_default: false, ) @@ -43,7 +45,7 @@ test_aaf = executable( 'unit/test-aaf.c', include_directories: include_directories('include'), link_with: avtp_lib, - dependencies: dependency('cmocka'), + dependencies: cmockadep, build_by_default: false, ) |