summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/core/package/package.lua17
-rw-r--r--xmake/modules/detect/packages/find_libxml2.lua48
2 files changed, 64 insertions, 1 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 6f0a6e4d0..1940780f9 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -228,8 +228,23 @@ function _instance:prefixfile()
return path.join(self:prefixdir(".info"), self:name() .. "-" .. (self:version_str() or "") .. ".txt")
end
+-- get variables
+function _instance:get(name)
+ return self:prefixinfo()[name]
+end
+
+-- set variables
+function _instance:set(name, ...)
+ self:prefixinfo()[name] = {...}
+end
+
+-- add variables
+function _instance:add(name, ...)
+ self:prefixinfo()[name] = table.join(self:prefixinfo()[name] or {}, ...)
+end
+
-- get environment variables
-function _instance:getenv(name, ...)
+function _instance:getenv(name)
return self:prefixinfo().envars and self:prefixinfo().envars[name] or nil
end
diff --git a/xmake/modules/detect/packages/find_libxml2.lua b/xmake/modules/detect/packages/find_libxml2.lua
new file mode 100644
index 000000000..18b873168
--- /dev/null
+++ b/xmake/modules/detect/packages/find_libxml2.lua
@@ -0,0 +1,48 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you 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 - 2018, TBOOX Open Source Group.
+--
+-- @author ruki
+-- @file find_libxml2.lua
+--
+
+-- imports
+import("lib.detect.pkg_config")
+
+-- find libxml2
+--
+-- @param opt the package options. e.g. see the options of find_package()
+--
+-- @return see the return value of find_package()
+--
+function main(opt)
+
+ -- find package from the current host platform
+ if opt.plat == os.host() and opt.arch == os.arch() then
+ local result = pkg_config.find("libxml2")
+ if result then
+ local includedirs = {}
+ for _, includedir in ipairs(result.includedirs) do
+ table.insert(includedirs, path.join(includedir, "libxml2"))
+ end
+ result.includedirs = includedirs
+ return result
+ end
+ end
+end