match version for find_package()

1 files changed, 9 insertions, 4 deletions

diff --git a/xmake/modules/lib/detect/pkg_config.lua b/xmake/modules/lib/detect/pkg_config.lua
index 15cb2a391..5b595b50d 100644
--- a/xmake/modules/lib/detect/pkg_config.lua
+++ b/xmake/modules/lib/detect/pkg_config.lua
@@ -118,7 +118,7 @@ function info(name, opt)
         local version = try { function() return os.iorunv(pkg_config, {"--modversion", name}) end }
         if version then
             result = result or {}
-            result.version = version
+            result.version = version:trim()
         end
     end
 
@@ -137,9 +137,9 @@ end
 -- find package 
 --
 -- @param name  the package name
--- @param opt   the argument options, {version = true}
+-- @param opt   the argument options, {plat = "", arch = "", version = "1.0.1"}
 --
--- @return      {links = {"ssl", "crypto", "z"}, linkdirs = {""}, includedirs = {""}, version = ""}
+-- @return      {links = {"ssl", "crypto", "z"}, linkdirs = {""}, includedirs = {""}}
 --
 -- @code 
 --
@@ -154,6 +154,12 @@ function find(name, opt)
     if not pkginfo then
         return 
     end
+
+    -- match version?
+    opt = opt or {}
+    if opt.version and pkginfo.version ~= opt.version then
+        return 
+    end
     
     -- find library 
     local result = nil
@@ -168,7 +174,6 @@ function find(name, opt)
 
     -- found?
     if result and result.links then
-        result.version      = pkginfo.version
         result.linkdirs     = table.unique(result.linkdirs)
         result.includedirs  = table.join(result.includedirs or {}, pkginfo.includedirs)
     end