Skip to content

fixed includedir not being relative from the cfg.workspace.location #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
LostbBlizzard wants to merge 1 commit into from
Closed

fixed includedir not being relative from the cfg.workspace.location #38

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions ninja.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,21 @@ local function getFileDependencies(cfg)
return dependencies
end

local function fixincludedir(cfg,includedirs)
local fixincludedirs = {}
for _,value in ipairs(includedirs) do
local newvalue = path.getrelative(cfg.workspace.location, value)

table.insert(fixincludedirs,newvalue)
end
return fixincludedirs
end
local function getcflags(toolset, cfg, filecfg)
local buildopt = ninja.list(filecfg.buildoptions)
local cppflags = ninja.list(toolset.getcppflags(filecfg))
local cflags = ninja.list(toolset.getcflags(filecfg))
local defines = ninja.list(table.join(toolset.getdefines(filecfg.defines), toolset.getundefines(filecfg.undefines)))
local includes = ninja.list(toolset.getincludedirs(cfg, filecfg.includedirs, filecfg.externalincludedirs, filecfg.frameworkdirs, filecfg.includedirsafter))
local includes = ninja.list(toolset.getincludedirs(cfg, fixincludedir(cfg,filecfg.includedirs), filecfg.externalincludedirs, filecfg.frameworkdirs, filecfg.includedirsafter))
local forceincludes = ninja.list(toolset.getforceincludes(cfg))

return buildopt .. cppflags .. cflags .. defines .. includes .. forceincludes
Expand All @@ -262,7 +271,7 @@ local function getcxxflags(toolset, cfg, filecfg)
local cppflags = ninja.list(toolset.getcppflags(filecfg))
local cxxflags = ninja.list(toolset.getcxxflags(filecfg))
local defines = ninja.list(table.join(toolset.getdefines(filecfg.defines), toolset.getundefines(filecfg.undefines)))
local includes = ninja.list(toolset.getincludedirs(cfg, filecfg.includedirs, filecfg.externalincludedirs, filecfg.frameworkdirs, filecfg.includedirsafter))
local includes = ninja.list(toolset.getincludedirs(cfg, fixincludedir(cfg,filecfg.includedirs), filecfg.externalincludedirs, filecfg.frameworkdirs, filecfg.includedirsafter))
local forceincludes = ninja.list(toolset.getforceincludes(cfg))
return buildopt .. cppflags .. cxxflags .. defines .. includes .. forceincludes
end
Expand Down