diff options
| author | RobotLeopard86 <63123751+RobotLeopard86@users.noreply.github.com> | 2025-11-24 14:25:13 -0800 |
|---|---|---|
| committer | Eli Schwartz <eschwartz93@gmail.com> | 2025-12-10 13:23:39 -0500 |
| commit | 4bbd1ef923e995cd88c255cef65649ab8b07cfc6 (patch) | |
| tree | 0bab7ac437490b19eeacc491a2a3564d9b486c60 | |
| parent | a2b2429bd73bf12a312341a5a3c90ee8c0fc4f40 (diff) | |
| download | meson-4bbd1ef923e995cd88c255cef65649ab8b07cfc6.tar.gz | |
cmake: Fix version kwarg being added to static_library targets
| -rw-r--r-- | mesonbuild/cmake/interpreter.py | 11 | ||||
| -rw-r--r-- | test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt | 1 |
2 files changed, 7 insertions, 5 deletions
diff --git a/mesonbuild/cmake/interpreter.py b/mesonbuild/cmake/interpreter.py index bdaa6d54c..88b0b8f3b 100644 --- a/mesonbuild/cmake/interpreter.py +++ b/mesonbuild/cmake/interpreter.py @@ -1182,11 +1182,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 version if we know it and this is not a static lib + if tgt_func != 'static_library': + 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: diff --git a/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt b/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt index 7dd11e749..06dd51a16 100644 --- a/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt +++ b/test cases/cmake/2 advanced/subprojects/cmMod/CMakeLists.txt @@ -12,6 +12,7 @@ configure_file("config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/config.h" @ONLY) add_library(cmModLib SHARED lib/cmMod.cpp) add_library(cmModLibStatic STATIC lib/cmMod.cpp) +set_target_properties(cmModLibStatic PROPERTIES SOVERSION 1) include(GenerateExportHeader) generate_export_header(cmModLib) |