From 1fdd1750a7c163fb911712e3cbc0d9d1385c589d Mon Sep 17 00:00:00 2001 From: Renaud Guillard Date: Tue, 7 Sep 2021 23:26:52 +0200 Subject: [PATCH] frameworkdirs and runpathdirs support for CodeLite generator --- modules/codelite/codelite_project.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/codelite/codelite_project.lua b/modules/codelite/codelite_project.lua index 4396f0c04b..c0d95e758f 100755 --- a/modules/codelite/codelite_project.lua +++ b/modules/codelite/codelite_project.lua @@ -195,7 +195,7 @@ end local toolset = m.getcompiler(cfg) - local sysincludedirs = toolset.getincludedirs(cfg, {}, cfg.sysincludedirs) + local sysincludedirs = toolset.getincludedirs(cfg, {}, cfg.sysincludedirs, cfg.frameworkdirs) local forceincludes = toolset.getforceincludes(cfg) local cxxflags = table.concat(table.join(sysincludedirs, toolset.getcxxflags(cfg), forceincludes, cfg.buildoptions), ";") local cflags = table.concat(table.join(sysincludedirs, toolset.getcflags(cfg), forceincludes, cfg.buildoptions), ";") @@ -225,7 +225,7 @@ end local toolset = m.getcompiler(cfg) - local flags = table.join(toolset.getldflags(cfg), cfg.linkoptions, toolset.getlinks(cfg)) + local flags = table.join(toolset.getldflags(cfg), toolset.getincludedirs(cfg, {}, nil, cfg.frameworkdirs), toolset.getrunpathdirs(cfg, table.join(cfg.runpathdirs, config.getsiblingtargetdirs(cfg))), cfg.linkoptions, toolset.getlinks(cfg)) _x(3, '', table.concat(flags, ";"))