AuroraPipeline/premake
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 1 Wiki Activity

xcode4 sysincludedirs support update

Browse Source 
* Use the new Xcode 9+ setting SYSTEM_HEADER_SEARCH_PATHS settings instead of HEADER_SEARCH_PATHS
* Update test
This commit is contained in:
Renaud Guillard 2020-10-23 09:58:07 +02:00
parent 5d06e68d45
commit dfb93e1640
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/xcode/tests/test_xcode_project.lua
View File

@ -2255,15 +2255,15 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ( OBJROOT = obj/Debug;
ONLY_ACTIVE_ARCH = NO;
SYMROOT = bin/Debug;
SYSTEM_HEADER_SEARCH_PATHS = (
../include, ../include,
../libs, ../libs,
"\"../name with spaces\"", "\"../name with spaces\"",
"$(inherited)", "$(inherited)",
); );
OBJROOT = obj/Debug;
ONLY_ACTIVE_ARCH = NO;
SYMROOT = bin/Debug;
}; };
name = Debug; name = Debug;
}; };

2
modules/xcode/xcode_common.lua
View File

@ -1370,7 +1370,7 @@
if not table.isempty(cfg.sysincludedirs) then if not table.isempty(cfg.sysincludedirs) then
table.insert(cfg.sysincludedirs, "$(inherited)") table.insert(cfg.sysincludedirs, "$(inherited)")
end end
settings['HEADER_SEARCH_PATHS'] = cfg.sysincludedirs settings['SYSTEM_HEADER_SEARCH_PATHS'] = cfg.sysincludedirs
for i,v in ipairs(cfg.libdirs) do for i,v in ipairs(cfg.libdirs) do
cfg.libdirs[i] = p.project.getrelative(cfg.project, cfg.libdirs[i]) cfg.libdirs[i] = p.project.getrelative(cfg.project, cfg.libdirs[i])