summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdel Vilkov <[email protected]>2019-04-14 18:19:15 +0300
committerAdel Vilkov <[email protected]>2019-04-14 18:19:15 +0300
commit3f990875386c52be7712d0e56debf4eab4c88b9a (patch)
tree74571d5e51197ac869caf6effe9126383bcd6139
parentba5f76ecdd4eb95ca942369fd9e52cf796beaa8b (diff)
Edited clib package installation paths
-rw-r--r--xmake/modules/package/manager/clib/find_package.lua2
-rw-r--r--xmake/modules/package/manager/clib/install_package.lua4
2 files changed, 2 insertions, 4 deletions
diff --git a/xmake/modules/package/manager/clib/find_package.lua b/xmake/modules/package/manager/clib/find_package.lua
index d64884429..39b18834f 100644
--- a/xmake/modules/package/manager/clib/find_package.lua
+++ b/xmake/modules/package/manager/clib/find_package.lua
@@ -27,7 +27,6 @@ function main(name, opt)
local cache_dir = path.join(os.projectdir(), ".xmake", "cache", "packages")
local marker_filename = string.gsub(name, "%/", "=")
local marker_path = path.join(cache_dir, marker_filename)
- dprint("reading clib marker file for %s from %s", name, marker_filename)
if not io.exists(marker_filename) then
return
@@ -40,7 +39,6 @@ function main(name, opt)
dprint("%s is installed to %s", name, install_path)
return {
- headerdirs = { install_path },
includedirs = { install_path }
}
end
diff --git a/xmake/modules/package/manager/clib/install_package.lua b/xmake/modules/package/manager/clib/install_package.lua
index 250ef8b66..54bb49f14 100644
--- a/xmake/modules/package/manager/clib/install_package.lua
+++ b/xmake/modules/package/manager/clib/install_package.lua
@@ -24,7 +24,7 @@ import("core.project.config")
import("lib.detect.find_tool")
-- install package
-- @param name the package name, e.g. clib::clibs/[email protected]
--- @param opt the options, .e.g { verbose = true, out_dir = "myDir",
+-- @param opt the options, .e.g { verbose = true, out_dir = "clib",
-- save = false, save_dev = false }
--
-- @return true or false
@@ -39,7 +39,7 @@ function main(name, opt)
-- default options
local all_opts = {
verbose = true,
- out_dir = path.join(".xmake", "cache", "packages", ".clib"),
+ out_dir = "clib",
save = false,
save_dev = false
}