diff options
| author | ruki <[email protected]> | 2021-09-24 00:18:57 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-09-24 00:18:57 +0800 |
| commit | 6708849f5c386a5d16f7be3d568afa10df49bc16 (patch) | |
| tree | 012c9a42f2841b6f54869ddc381b5192a1a89eaa | |
| parent | b97aff569ccc11b3ac617ca55b560488998a9e19 (diff) | |
improve tests
| -rw-r--r-- | tests/apis/add_configfiles/config.h.in | 2 | ||||
| -rw-r--r-- | tests/apis/check_xxx/config.h.in | 2 | ||||
| -rw-r--r-- | xmake/core/project/target.lua | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/tests/apis/add_configfiles/config.h.in b/tests/apis/add_configfiles/config.h.in index 5ba4bddb3..c1ea00299 100644 --- a/tests/apis/add_configfiles/config.h.in +++ b/tests/apis/add_configfiles/config.h.in @@ -9,3 +9,5 @@ ${define FOO_DEFINE} ${define FOO2_ENABLE} ${define FOO2_ENABLE2} ${define FOO2_STRING} + +#define HAVE_SSE2 ${default HAVE_SSE2 0} diff --git a/tests/apis/check_xxx/config.h.in b/tests/apis/check_xxx/config.h.in index 0c7d9ebf8..617ecf864 100644 --- a/tests/apis/check_xxx/config.h.in +++ b/tests/apis/check_xxx/config.h.in @@ -1,6 +1,5 @@ ${define HAS_STRING_H} ${define HAS_STRING_AND_STDIO_H} -${define HAS_WCHAR} ${define HAS_WCHAR_AND_FLOAT} ${define HAS_PTHREAD} ${define HAS_STATIC_ASSERT} @@ -10,3 +9,4 @@ ${define HAS_CONSEXPR_AND_STATIC_ASSERT} ${define HAS_SSE2} ${define HAS_LONG_8} ${define PTR_SIZE} +#define HAS_WCHAR ${default HAS_WCHAR 0} diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index d51cc6b71..3e2d308f9 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -729,7 +729,7 @@ function _instance:orderopts(opt) -- load options if be enabled orderopts = {} - for _, name in ipairs(table.wrap(self:get("options"))) do + for _, name in ipairs(table.wrap(self:get("options", opt))) do local opt_ = nil if config.get(name) then opt_ = option.load(name) end if opt_ then @@ -738,7 +738,7 @@ function _instance:orderopts(opt) end -- load options from packages if no require info, be compatible with the option package in (*.pkg) - for _, name in ipairs(table.wrap(self:get("packages"))) do + for _, name in ipairs(table.wrap(self:get("packages", opt))) do if not project_package.load(name) then local opt_ = nil if config.get(name) then opt_ = option.load(name) end |