diff options
| author | ruki <[email protected]> | 2017-08-04 16:10:32 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-08-04 16:10:32 +0800 |
| commit | eb8890ce43cd01f0880c534361a9d1b4b12242b6 (patch) | |
| tree | a5ebbf4afaa8bc5306521a78f88148a884a38e86 | |
| parent | a5883797cef9544b8d1c147c549657ca3e9c4883 (diff) | |
fix option and target add bug
| -rw-r--r-- | xmake/core/project/option.lua | 2 | ||||
| -rw-r--r-- | xmake/core/project/target.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/project/option.lua b/xmake/core/project/option.lua index dcba6a13f..9571293de 100644 --- a/xmake/core/project/option.lua +++ b/xmake/core/project/option.lua @@ -272,7 +272,7 @@ end -- add the value to the option info function option:add(name_or_info, ...) if type(name_or_info) == "string" then - self._INFO[name_or_info] = table.unique(table.join2(table.wrap(self._INFO[name_or_info]), ...)) + self._INFO[name_or_info] = table.unique(table.join(table.wrap(self._INFO[name_or_info]), ...)) elseif type(name_or_info) == "table" and #name_or_info == 0 then for name, info in pairs(table.join(name_or_info, ...)) do self:add(name, info) diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua index 8f66e37d8..9cf91343e 100644 --- a/xmake/core/project/target.lua +++ b/xmake/core/project/target.lua @@ -91,7 +91,7 @@ end -- add the value to the target info function target:add(name_or_info, ...) if type(name_or_info) == "string" then - self._INFO[name_or_info] = table.unique(table.join2(table.wrap(self._INFO[name_or_info]), ...)) + self._INFO[name_or_info] = table.unique(table.join(table.wrap(self._INFO[name_or_info]), ...)) elseif type(name_or_info) == "table" and #name_or_info == 0 then for name, info in pairs(table.join(name_or_info, ...)) do self:add(name, info) |