improve pkg-config and add some builtin packages

4 files changed, 171 insertions, 0 deletions

diff --git a/xmake/modules/detect/packages/find_mbedtls.lua b/xmake/modules/detect/packages/find_mbedtls.lua
new file mode 100644
index 000000000..e92efddac
--- /dev/null
+++ b/xmake/modules/detect/packages/find_mbedtls.lua
@@ -0,0 +1,40 @@
+--!The Make-like 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 - 2017, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_mbedtls.lua
+--
+
+-- imports
+import("lib.detect.pkg_config")
+
+-- find mbedtls 
+--
+-- @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
+        return pkg_config.find("mbedtls", {links = {"mbedtls", "mbedcrypto", "mbedx509"}})
+    end
+end
diff --git a/xmake/modules/detect/packages/find_mysql.lua b/xmake/modules/detect/packages/find_mysql.lua
new file mode 100644
index 000000000..21694e86b
--- /dev/null
+++ b/xmake/modules/detect/packages/find_mysql.lua
@@ -0,0 +1,40 @@
+--!The Make-like 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 - 2017, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_mysql.lua
+--
+
+-- imports
+import("lib.detect.pkg_config")
+
+-- find mysql 
+--
+-- @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
+        return pkg_config.find("mysqlclient")
+    end
+end
diff --git a/xmake/modules/detect/packages/find_pcre.lua b/xmake/modules/detect/packages/find_pcre.lua
new file mode 100644
index 000000000..a4284dc94
--- /dev/null
+++ b/xmake/modules/detect/packages/find_pcre.lua
@@ -0,0 +1,45 @@
+--!The Make-like 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 - 2017, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_pcre.lua
+--
+
+-- imports
+import("lib.detect.pkg_config")
+
+-- find pcre 
+--
+-- @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
+        for _, width in ipairs({"", "16", "32"}) do
+            local result = pkg_config.find("libpcre" .. width)
+            if result then
+                return result
+            end
+        end
+    end
+end
diff --git a/xmake/modules/detect/packages/find_pcre2.lua b/xmake/modules/detect/packages/find_pcre2.lua
new file mode 100644
index 000000000..66f6e8a29
--- /dev/null
+++ b/xmake/modules/detect/packages/find_pcre2.lua
@@ -0,0 +1,46 @@
+--!The Make-like 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 - 2017, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_pcre2.lua
+--
+
+-- imports
+import("lib.detect.pkg_config")
+
+-- find pcre2 
+--
+-- @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
+        for _, width in ipairs({"8", "16", "32"}) do
+            local result = pkg_config.find("libpcre2-" .. width)
+            if result then
+                result.defines = {"PCRE2_CODE_UNIT_WIDTH=" .. width}
+                return result
+            end
+        end
+    end
+end