diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-12-18 15:32:13 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-12-22 22:38:20 +0200 |
| commit | 77e0008a1fede82851fdf13438619cb62e61c297 (patch) | |
| tree | c17db0ec3c718b5d664534344056b5139ae68fa4 /test cases/cmake/5 object library/meson.build | |
| parent | 7981308e6e600535efeba6b50cdda62d43e7c584 (diff) | |
| download | meson-77e0008a1fede82851fdf13438619cb62e61c297.zip meson-77e0008a1fede82851fdf13438619cb62e61c297.tar.gz meson-77e0008a1fede82851fdf13438619cb62e61c297.tar.bz2 | |
cmake: Fix obeject libraries
This fixes an issue with generated sources and object libraries, as
well as an issue on windows with the `link` linker and the vs backend.
The last issue is resolved by building the source files multiple times
to avoid extracting object files in meson.
Diffstat (limited to 'test cases/cmake/5 object library/meson.build')
| -rw-r--r-- | test cases/cmake/5 object library/meson.build | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/test cases/cmake/5 object library/meson.build b/test cases/cmake/5 object library/meson.build index c338136..f38a2dd 100644 --- a/test cases/cmake/5 object library/meson.build +++ b/test cases/cmake/5 object library/meson.build @@ -1,15 +1,10 @@ -project('cmake_object_lib_test', 'cpp') +project('cmake_object_lib_test', ['c', 'cpp']) dep_test = dependency('ZLIB', method: 'cmake', required: false) if not dep_test.found() error('MESON_SKIP_TEST: zlib is not installed') endif -cpp = meson.get_compiler('cpp') -if build_machine.system() == 'windows' and cpp.get_id() != 'gcc' - error('MESON_SKIP_TEST: Windows link.exe is not supported because of symbol export problems') -endif - cm = import('cmake') sub_pro = cm.subproject('cmObjLib') |