diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-05-28 16:57:10 +0200 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-06-06 18:27:05 +0200 |
| commit | 2f998cd8d5ab7f794b86fdf9d34630b645b8a72b (patch) | |
| tree | b867cc0a9e15cdfd97ab0fc6434f1c26e82a13b5 /test cases/cmake/2 advanced | |
| parent | e02c1015750fb9a5a15a9d0930281cd78e012133 (diff) | |
| download | meson-2f998cd8d5ab7f794b86fdf9d34630b645b8a72b.zip meson-2f998cd8d5ab7f794b86fdf9d34630b645b8a72b.tar.gz meson-2f998cd8d5ab7f794b86fdf9d34630b645b8a72b.tar.bz2 | |
cmake: Updated test cases
Diffstat (limited to 'test cases/cmake/2 advanced')
| -rw-r--r-- | test cases/cmake/2 advanced/meson.build | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/test cases/cmake/2 advanced/meson.build b/test cases/cmake/2 advanced/meson.build index 5f949f4..385a49b 100644 --- a/test cases/cmake/2 advanced/meson.build +++ b/test cases/cmake/2 advanced/meson.build @@ -5,18 +5,16 @@ if not dep_test.found() error('MESON_SKIP_TEST: zlib is not installed') endif -# Test the "normal" subproject call -sub_pro = subproject('cmMod') -sub_dep = sub_pro.get_variable('cmModLib_dep') +cm = import('cmake') -# Test the dependency shortcut -shortcut_dep = dependency('ttabadbneiobevn', fallback: ['cmMod', 'cmModLib_dep']) +# Test the "normal" subproject call +sub_pro = cm.subproject('cmMod') +sub_dep = sub_pro.dependency('cmModLib') # Build some files exe1 = executable('main1', ['main.cpp'], dependencies: [sub_dep]) -exe2 = executable('main2', ['main.cpp'], dependencies: [shortcut_dep]) test('test1', exe1) -test('test2', exe2) # Test if we can also extract executables -test('test3', sub_pro.get_variable('testEXE')) +assert(sub_pro.target_type('testEXE') == 'executable', 'The type must be executable for obvious reasons') +test('test2', sub_pro.target('testEXE')) |