diff options
| author | Julianne Swinoga <jswinoga@kepler.space> | 2025-06-05 17:47:51 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2025-08-26 01:35:18 -0400 |
| commit | 8992d4fdf5b7a2c2d37d2d61d7a640d8e4c09f2b (patch) | |
| tree | 4ddf057a96c166a015dda393a9fd64e8c8d134af | |
| parent | 01884547172ff0182e34f4d7212913459210cf09 (diff) | |
| download | meson-8992d4fdf5b7a2c2d37d2d61d7a640d8e4c09f2b.zip meson-8992d4fdf5b7a2c2d37d2d61d7a640d8e4c09f2b.tar.gz meson-8992d4fdf5b7a2c2d37d2d61d7a640d8e4c09f2b.tar.bz2 | |
Set version, soversion from cmake if available
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 10 | ||||
| -rw-r--r-- | test cases/cmake/2 advanced/meson.build | 18 |
2 files changed, 28 insertions, 0 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index c68cb60..1019246 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -243,6 +243,8 @@ class ConverterTarget: self.compile_opts: T.Dict[str, T.List[str]] = {} self.public_compile_opts: T.List[str] = [] self.pie = False + self.version: T.Optional[str] = None + self.soversion: T.Optional[str] = None # Project default override options (c_std, cpp_std, etc.) self.override_options: T.List[str] = [] @@ -357,6 +359,8 @@ class ConverterTarget: tgt = trace.targets.get(self.cmake_name) if tgt: self.depends_raw = trace.targets[self.cmake_name].depends + self.version = trace.targets[self.cmake_name].properties.get('VERSION', [None])[0] + self.soversion = trace.targets[self.cmake_name].properties.get('SOVERSION', [None])[0] rtgt = resolve_cmake_trace_targets(self.cmake_name, trace, self.env, clib_compiler=self.clib_compiler) self.includes += [Path(x) for x in rtgt.include_directories] @@ -1172,6 +1176,12 @@ class CMakeInterpreter: 'objects': [method(x, 'extract_all_objects') for x in objec_libs], } + # Only set version if we know it + if tgt.version: + tgt_kwargs['version'] = tgt.version + if tgt.soversion: + tgt_kwargs['soversion'] = tgt.soversion + # Only set if installed and only override if it is set if install_tgt and tgt.install_dir: tgt_kwargs['install_dir'] = tgt.install_dir diff --git a/test cases/cmake/2 advanced/meson.build b/test cases/cmake/2 advanced/meson.build index 39da0c6..43b5f8b 100644 --- a/test cases/cmake/2 advanced/meson.build +++ b/test cases/cmake/2 advanced/meson.build @@ -27,3 +27,21 @@ test('test3', sub_pro.target('testEXE')) # Test that we can add a new target with the same name as the CMake subproject exe4 = executable('testEXE', ['main.cpp'], dependencies: [sub_sta]) test('test4', exe4) + +# Test if libraries are named correctly +assert(sub_pro.target_type('cmModLib') == 'shared_library', 'Type should be shared_library') +expected_soversion_str = '1' +expected_version_str = '1.0.1' +lib_file_name = import('fs').name(sub_pro.target('cmModLib').full_path()) +if host_machine.system() == 'linux' + # Linux shared libraries end with their version: libcmModLib.so.1.0.1 + lib_version_ok = lib_file_name.endswith(expected_version_str) +elif host_machine.system() == 'darwin' + # MacOS shared libraries are suffixed with their soversion: libcmModLib.1.dylib + lib_version_ok = lib_file_name.split('.')[1] == expected_soversion_str +else + # Don't try to assert anything about the library version, either unknown host + # system or host system doesn't support versioning of shared libraries + lib_version_ok = true +endif +assert(lib_version_ok, f'Shared library version @lib_file_name@ not picked up correctly') |