diff options
| author | Andre Guedes <andre.guedes@intel.com> | 2018-06-04 10:21:35 -0700 |
|---|---|---|
| committer | Andre Guedes <andre.guedes@intel.com> | 2018-06-04 10:35:22 -0700 |
| commit | 66ec2f5ef323868b79008f8d88d28d163411f918 (patch) | |
| tree | 72e13c4682a16cfd7e799ada850945ff9384546f | |
| parent | 070b1204df0e79fc9d1481d313f07e6ed4350a2c (diff) | |
| download | Open-AVB-66ec2f5ef323868b79008f8d88d28d163411f918.tar.gz | |
libavtp: build: Fix cmocka dependency
Currently libavtp build fails if cmocka is not installed on the system.
However, libavtp itself doesn't depend on cmocka, only unit tests do so.
This patch fixes this issue by setting cmocka dependency as not
mandatory. It also takes the opportunity to set the cmocka version
required.
| -rw-r--r-- | lib/libavtp/meson.build | 6 |
1 files changed, 4 insertions, 2 deletions
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, ) |