summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-18 22:51:50 +0800
committerruki <[email protected]>2019-01-18 11:11:04 +0800
commitef86b43e8d35a9dd633e5a8236fc0976215c47b3 (patch)
tree850385d4613dc4d6eff9ccb5945037fecedd0cdc
parent7fc558e7cb19a55ac78950589810d845ae6e77c3 (diff)
fix headerfiles
-rw-r--r--xmake/core/project/target.lua11
1 files changed, 9 insertions, 2 deletions
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index ade258262..ad12d1e63 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -1028,8 +1028,15 @@ function target:headerfiles(outputdir, only_deprecated)
end
if not headers then return end
- -- get the headerdir
- local headerdir = outputdir or (only_deprecated and self:headerdir() or path.join(self:installdir(), "include"))
+ -- get the installed header directory
+ local headerdir = outputdir
+ if not headerdir then
+ if only_deprecated then
+ headerdir = self:headerdir()
+ elseif self:installdir() then
+ headerdir = path.join(self:installdir(), "include")
+ end
+ end
-- get the extra information
local extrainfo = table.wrap(self:get("__extra_headerfiles"))