summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2018-12-20 00:34:27 +0800
committerruki <[email protected]>2018-12-19 21:26:47 +0800
commit3cd27c65b98182bbdba8f9913951d479a37cdc80 (patch)
tree9f80a5cd276bda2f2b46db8e8cfaa6e370a46ce6
parent27e69917cb7c5c6794ff2e9b579acb6280dfd2a6 (diff)
fix option.add_includedirs for cuda
-rw-r--r--CHANGELOG.md2
-rw-r--r--xmake/languages/cuda/xmake.lua5
2 files changed, 7 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a103c208..95f068ae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@
* Fix cannot call `set_optimize()` to set optimization flags when exists `add_rules("mode.release")`
* [#289](https://github.com/tboox/xmake/issues/289): Fix unarchive gzip file failed on windows
+* [#296](https://github.com/tboox/xmake/issues/296): Fix `option.add_includedirs` for cuda
## v2.2.3
@@ -551,6 +552,7 @@
* 修复无法通过 `set_optimize()` 设置优化选项,如果存在`add_rules("mode.release")`的情况下
* [#289](https://github.com/tboox/xmake/issues/289): 修复在windows下解压gzip文件失败
+* [#296](https://github.com/tboox/xmake/issues/296): 修复`option.add_includedirs`对cuda编译不生效
## v2.2.3
diff --git a/xmake/languages/cuda/xmake.lua b/xmake/languages/cuda/xmake.lua
index 7eff663e1..2e81f065c 100644
--- a/xmake/languages/cuda/xmake.lua
+++ b/xmake/languages/cuda/xmake.lua
@@ -60,6 +60,11 @@ language("cuda")
, "target.optimize:check"
, "target.vectorexts:check"
, "target.includedirs"
+ , "option.symbols"
+ , "option.warnings"
+ , "option.optimize:check"
+ , "option.vectorexts:check"
+ , "option.includedirs"
, "platform.includedirs"
}
, binary =