rename to check importfiles

3 files changed, 60 insertions, 44 deletions

diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index a5d6283db..f81bf2a0a 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -2712,14 +2712,14 @@ function _instance:check_fcsnippets(snippets, opt)
     return sandbox_module.import("lib.detect.check_fcsnippets", {anonymous = true})(snippets, opt)
 end
 
--- check the given pkgconfig file?
+-- check the given importfiles?
 --
--- @param name      the .pc filename (without .pc extension)
+-- @param names     the import filenames (without .pc/.cmake extension), e.g. pkgconfig::libxml-2.0, cmake::CURL
 -- @param opt       the argument options
 --
 -- @return          true or false, errors
 --
-function _instance:check_pkgconfig(name, opt)
+function _instance:check_importfiles(names, opt)
     opt = opt or {}
     if opt.configdirs == nil then
         local configdirs = {}
@@ -2730,7 +2730,7 @@ function _instance:check_pkgconfig(name, opt)
         end
         opt.configdirs = configdirs
     end
-    return sandbox_module.import("lib.detect.check_pkgconfig", {anonymous = true})(name or self:name(), opt)
+    return sandbox_module.import("lib.detect.check_importfiles", {anonymous = true})(names or ("pkgconfig::" .. self:name()), opt)
 end
 
 -- the current mode is belong to the given modes?
diff --git a/xmake/modules/lib/detect/check_importfiles.lua b/xmake/modules/lib/detect/check_importfiles.lua
new file mode 100644
index 000000000..caa61e4c7
--- /dev/null
+++ b/xmake/modules/lib/detect/check_importfiles.lua
@@ -0,0 +1,56 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        check_importfiles.lua
+--
+
+-- imports
+import("core.base.option")
+import("lib.detect.pkgconfig")
+
+-- check the given importfiles for pkgconfig/cmake
+--
+-- @param names the import filenames (without .pc/.cmake suffix), e.g. pkgconfig::libxml-2.0, cmake::CURL
+-- @param opt   the argument options, e.g. { verbose = true, configdirs = {"lib"}}
+--
+function main(names, opt)
+    for _, name in ipairs(names) do
+        local kind
+        local parts = name:split("::")
+        if #parts == 2 then
+            kind = parts[1]
+            name = parts[2]
+        end
+        if kind == nil then
+            kind = "pkgconfig"
+        end
+        if kind == "pkgconfig" then
+            local result = pkgconfig.libinfo(name, opt)
+            if opt.verbose or option.get("verbose") or option.get("diagnosis") then
+                cprint("${dim}> checking for pkgconfig/%s.pc", name)
+                if result then
+                    print(result)
+                end
+            end
+            if not result then
+                return false, string.format("pkgconfig/%s.pc not found!", name)
+            end
+        end
+    end
+    return true
+end
+
diff --git a/xmake/modules/lib/detect/check_pkgconfig.lua b/xmake/modules/lib/detect/check_pkgconfig.lua
deleted file mode 100644
index 97fdabe55..000000000
--- a/xmake/modules/lib/detect/check_pkgconfig.lua
+++ /dev/null
@@ -1,40 +0,0 @@
---!A cross-platform build utility based on Lua
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
---
--- Copyright (C) 2015-present, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        check_pkgconfig.lua
---
-
--- imports
-import("core.base.option")
-import("lib.detect.pkgconfig")
-
--- check the given pkgconfig file
---
--- @param name      the .pc file name
--- @param opt       the argument options, e.g. { verbose = true, configdirs = {"lib"}}
---
-function main(name, opt)
-    local result = pkgconfig.libinfo(name, opt)
-    if opt.verbose or option.get("verbose") or option.get("diagnosis") then
-        cprint("${dim}> checking for pkgconfig/%s.pc", name)
-        if result then
-            print(result)
-        end
-    end
-    return result
-end
-