Merge pull request #6409 from Arthapz/fix-cmake-meson-sharedlibraries

(cmake, meson) append shared/static libraries flag by default when installing packages

1 files changed, 9 insertions, 0 deletions

diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
index 2e75e0459..c4821d549 100644
--- a/xmake/modules/package/tools/meson.lua
+++ b/xmake/modules/package/tools/meson.lua
@@ -330,6 +330,7 @@ function _get_configs(package, configs, opt)
 
     -- add prefix
     configs = configs or {}
+    opt._configs_str = string.serialize(configs, {indent = false, strip = true})
     table.insert(configs, "--prefix=" .. (opt.prefix or package:installdir()))
     table.insert(configs, "--libdir=lib")
 
@@ -351,6 +352,14 @@ function _get_configs(package, configs, opt)
         table.insert(configs, "-Db_sanitize=address")
     end
 
+    -- add library kind
+    if package:is_library() then
+        local has_already_libflag = opt._configs_str and opt._configs_str:find("default_library", 1, true)
+        if not has_already_libflag then
+            table.insert(configs, "-Ddefault_library=".. (package:config("shared") and "shared" or "static"))
+        end
+    end
+
     -- add vs runtimes flags
     if package:is_plat("windows") then
         table.insert(configs, "--vsenv")