diff options
| -rw-r--r-- | xmake/languages/asm/api.lua | 4 | ||||
| -rw-r--r-- | xmake/languages/asm/xmake.lua | 3 | ||||
| -rw-r--r-- | xmake/languages/c++/api.lua | 4 | ||||
| -rw-r--r-- | xmake/languages/c++/xmake.lua | 3 | ||||
| -rw-r--r-- | xmake/languages/cuda/api.lua | 3 | ||||
| -rw-r--r-- | xmake/languages/cuda/xmake.lua | 3 | ||||
| -rw-r--r-- | xmake/languages/dlang/api.lua | 4 | ||||
| -rw-r--r-- | xmake/languages/dlang/xmake.lua | 3 | ||||
| -rw-r--r-- | xmake/languages/fortran/api.lua | 4 | ||||
| -rw-r--r-- | xmake/languages/fortran/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/languages/golang/api.lua | 2 | ||||
| -rw-r--r-- | xmake/languages/golang/xmake.lua | 3 | ||||
| -rw-r--r-- | xmake/languages/msrc/api.lua | 2 | ||||
| -rw-r--r-- | xmake/languages/msrc/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/languages/objc++/api.lua | 3 | ||||
| -rw-r--r-- | xmake/languages/objc++/xmake.lua | 3 | ||||
| -rw-r--r-- | xmake/languages/rust/api.lua | 2 |
17 files changed, 47 insertions, 3 deletions
diff --git a/xmake/languages/asm/api.lua b/xmake/languages/asm/api.lua index 2e25cbc16..1f056b64f 100644 --- a/xmake/languages/asm/api.lua +++ b/xmake/languages/asm/api.lua @@ -56,6 +56,7 @@ function apis() , "package.add_rpathdirs" , "package.add_linkdirs" , "package.add_includedirs" + , "package.add_sysincludedirs" -- toolchain.add_xxx , "toolchain.add_links" , "toolchain.add_syslinks" @@ -68,6 +69,7 @@ function apis() , "toolchain.add_rpathdirs" , "toolchain.add_linkdirs" , "toolchain.add_includedirs" + , "toolchain.add_sysincludedirs" } _g.paths = { @@ -77,9 +79,11 @@ function apis() , "target.add_headerfiles" , "target.add_linkdirs" , "target.add_includedirs" + , "target.add_sysincludedirs" -- option.add_xxx , "option.add_linkdirs" , "option.add_includedirs" + , "option.add_sysincludedirs" } -- ok diff --git a/xmake/languages/asm/xmake.lua b/xmake/languages/asm/xmake.lua index 7769d1700..3e9516721 100644 --- a/xmake/languages/asm/xmake.lua +++ b/xmake/languages/asm/xmake.lua @@ -72,6 +72,9 @@ language("asm") , "toolchain.includedirs" , "toolchain.defines" , "toolchain.undefines" + , "target.sysincludedirs" + , "option.sysincludedirs" + , "toolchain.sysincludedirs" } , binary = { diff --git a/xmake/languages/c++/api.lua b/xmake/languages/c++/api.lua index e2084d138..faf4ad85a 100644 --- a/xmake/languages/c++/api.lua +++ b/xmake/languages/c++/api.lua @@ -216,6 +216,7 @@ function apis() , "package.add_rpathdirs" , "package.add_linkdirs" , "package.add_includedirs" --@note we need not uses paths for package, see https://github.com/xmake-io/xmake/issues/717 + , "package.add_sysincludedirs" , "package.add_frameworkdirs" -- toolchain.add_xxx , "toolchain.add_links" @@ -232,6 +233,7 @@ function apis() , "toolchain.add_rpathdirs" , "toolchain.add_linkdirs" , "toolchain.add_includedirs" + , "toolchain.add_sysincludedirs" , "toolchain.add_frameworkdirs" } _g.paths = @@ -248,10 +250,12 @@ function apis() , "target.add_headerfiles" , "target.add_linkdirs" , "target.add_includedirs" + , "target.add_sysincludedirs" , "target.add_frameworkdirs" -- option.add_xxx , "option.add_linkdirs" , "option.add_includedirs" + , "option.add_sysincludedirs" , "option.add_frameworkdirs" } _g.dictionary = diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua index db18347c8..56c88b139 100644 --- a/xmake/languages/c++/xmake.lua +++ b/xmake/languages/c++/xmake.lua @@ -87,6 +87,9 @@ language("c++") , "toolchain.undefines" , "toolchain.frameworkdirs" , "toolchain.frameworks" + , "target.sysincludedirs" + , "option.sysincludedirs" + , "toolchain.sysincludedirs" } , binary = { diff --git a/xmake/languages/cuda/api.lua b/xmake/languages/cuda/api.lua index c369fd7cc..f456da03c 100644 --- a/xmake/languages/cuda/api.lua +++ b/xmake/languages/cuda/api.lua @@ -66,9 +66,10 @@ function apis() -- target.add_xxx "target.add_linkdirs" , "target.add_includedirs" + , "target.add_sysincludedirs" -- option.add_xxx , "option.add_linkdirs" - , "option.add_includedirs" + , "option.add_sysincludedirs" } -- ok diff --git a/xmake/languages/cuda/xmake.lua b/xmake/languages/cuda/xmake.lua index dc83c6452..6a4981e50 100644 --- a/xmake/languages/cuda/xmake.lua +++ b/xmake/languages/cuda/xmake.lua @@ -73,6 +73,9 @@ language("cuda") , "toolchain.includedirs" , "toolchain.defines" , "toolchain.undefines" + , "target.sysincludedirs" + , "option.sysincludedirs" + , "toolchain.sysincludedirs" } , binary = { diff --git a/xmake/languages/dlang/api.lua b/xmake/languages/dlang/api.lua index 9f6f92b3e..699fd5215 100644 --- a/xmake/languages/dlang/api.lua +++ b/xmake/languages/dlang/api.lua @@ -50,6 +50,7 @@ function apis() , "package.add_rpathdirs" , "package.add_linkdirs" , "package.add_includedirs" + , "package.add_sysincludedirs" -- toolchain.add_xxx , "toolchain.add_links" , "toolchain.add_syslinks" @@ -60,15 +61,18 @@ function apis() , "toolchain.add_rpathdirs" , "toolchain.add_linkdirs" , "toolchain.add_includedirs" + , "toolchain.add_sysincludedirs" } _g.paths = { -- target.add_xxx "target.add_linkdirs" , "target.add_includedirs" + , "target.add_sysincludedirs" -- option.add_xxx , "option.add_linkdirs" , "option.add_includedirs" + , "option.add_sysincludedirs" } -- ok diff --git a/xmake/languages/dlang/xmake.lua b/xmake/languages/dlang/xmake.lua index 75c77f6c2..89304e63d 100644 --- a/xmake/languages/dlang/xmake.lua +++ b/xmake/languages/dlang/xmake.lua @@ -61,6 +61,9 @@ language("dlang") , "target.includedirs" , "option.includedirs" , "toolchain.includedirs" + , "target.sysincludedirs" + , "option.sysincludedirs" + , "toolchain.sysincludedirs" } , binary = { diff --git a/xmake/languages/fortran/api.lua b/xmake/languages/fortran/api.lua index 69eae4ae2..bda6eb27a 100644 --- a/xmake/languages/fortran/api.lua +++ b/xmake/languages/fortran/api.lua @@ -50,6 +50,7 @@ function apis() , "package.add_rpathdirs" , "package.add_linkdirs" , "package.add_includedirs" + , "package.add_sysincludedirs" -- toolchain.add_xxx , "toolchain.add_links" , "toolchain.add_syslinks" @@ -60,15 +61,18 @@ function apis() , "toolchain.add_rpathdirs" , "toolchain.add_linkdirs" , "toolchain.add_includedirs" + , "toolchain.add_sysincludedirs" } _g.paths = { -- target.add_xxx "target.add_linkdirs" , "target.add_includedirs" + , "target.add_sysincludedirs" -- option.add_xxx , "option.add_linkdirs" , "option.add_includedirs" + , "option.add_sysincludedirs" } -- ok diff --git a/xmake/languages/fortran/xmake.lua b/xmake/languages/fortran/xmake.lua index 3d217f8f7..f1c177d22 100644 --- a/xmake/languages/fortran/xmake.lua +++ b/xmake/languages/fortran/xmake.lua @@ -60,6 +60,8 @@ language("fortran") , "target.vectorexts:check" , "target.includedirs" , "toolchain.includedirs" + , "target.sysincludedirs" + , "toolchain.sysincludedirs" } , binary = { diff --git a/xmake/languages/golang/api.lua b/xmake/languages/golang/api.lua index 0c64acf2f..33aa0f58e 100644 --- a/xmake/languages/golang/api.lua +++ b/xmake/languages/golang/api.lua @@ -48,9 +48,11 @@ function apis() -- target.add_xxx "target.add_linkdirs" , "target.add_includedirs" + , "target.add_sysincludedirs" -- option.add_xxx , "option.add_linkdirs" , "option.add_includedirs" + , "option.add_sysincludedirs" } -- ok diff --git a/xmake/languages/golang/xmake.lua b/xmake/languages/golang/xmake.lua index 3a8a70aca..0cec1497c 100644 --- a/xmake/languages/golang/xmake.lua +++ b/xmake/languages/golang/xmake.lua @@ -65,6 +65,9 @@ language("golang") , "toolchain.includedirs" , "toolchain.defines" , "toolchain.undefines" + , "target.sysincludedirs" + , "option.sysincludedirs" + , "toolchain.sysincludedirs" } , binary = { diff --git a/xmake/languages/msrc/api.lua b/xmake/languages/msrc/api.lua index 5c97212d7..86272fda1 100644 --- a/xmake/languages/msrc/api.lua +++ b/xmake/languages/msrc/api.lua @@ -35,8 +35,10 @@ function apis() { -- target.add_xxx "target.add_includedirs" + , "target.add_sysincludedirs" -- option.add_xxx , "option.add_includedirs" + , "option.add_sysincludedirs" } -- ok diff --git a/xmake/languages/msrc/xmake.lua b/xmake/languages/msrc/xmake.lua index bc261d756..aeaaf7422 100644 --- a/xmake/languages/msrc/xmake.lua +++ b/xmake/languages/msrc/xmake.lua @@ -55,6 +55,8 @@ language("msrc") , "toolchain.includedirs" , "toolchain.defines" , "toolchain.undefines" + , "target.sysincludedirs" + , "toolchain.sysincludedirs" } } diff --git a/xmake/languages/objc++/api.lua b/xmake/languages/objc++/api.lua index 5d5a3ae0b..b31ee81c7 100644 --- a/xmake/languages/objc++/api.lua +++ b/xmake/languages/objc++/api.lua @@ -79,6 +79,7 @@ function apis() , "toolchain.add_rpathdirs" , "toolchain.add_linkdirs" , "toolchain.add_includedirs" + , "toolchain.add_sysincludedirs" , "toolchain.add_frameworkdirs" } _g.paths = @@ -95,10 +96,12 @@ function apis() , "target.add_headerfiles" , "target.add_linkdirs" , "target.add_includedirs" + , "target.add_sysincludedirs" , "target.add_frameworkdirs" -- option.add_xxx , "option.add_linkdirs" , "option.add_includedirs" + , "option.add_sysincludedirs" , "option.add_frameworkdirs" } diff --git a/xmake/languages/objc++/xmake.lua b/xmake/languages/objc++/xmake.lua index 7c29cce57..c0dd6668b 100644 --- a/xmake/languages/objc++/xmake.lua +++ b/xmake/languages/objc++/xmake.lua @@ -85,6 +85,9 @@ language("objc++") , "toolchain.undefines" , "toolchain.frameworkdirs" , "toolchain.frameworks" + , "target.sysincludedirs" + , "option.sysincludedirs" + , "toolchain.sysincludedirs" } , binary = { diff --git a/xmake/languages/rust/api.lua b/xmake/languages/rust/api.lua index b7864eae2..a2dee1d3f 100644 --- a/xmake/languages/rust/api.lua +++ b/xmake/languages/rust/api.lua @@ -47,10 +47,8 @@ function apis() { -- target.add_xxx "target.add_linkdirs" - , "target.add_includedirs" -- option.add_xxx , "option.add_linkdirs" - , "option.add_includedirs" } -- ok |
