diff options
| author | ruki <[email protected]> | 2019-05-04 21:19:04 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-05-04 21:19:04 +0800 |
| commit | dfdbe5da7702606001a2141082708f6ed5acd733 (patch) | |
| tree | 9fb0731c30cbae5120190e23569933402961e68f | |
| parent | 27129a5b56f35e8d06d7358b42ab99e813b60f46 (diff) | |
improve package
| -rw-r--r-- | xmake/core/package/package.lua | 24 | ||||
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 2 |
2 files changed, 4 insertions, 22 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 9ee9cea58..2687a4fd4 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -153,35 +153,17 @@ end -- get the alias of url, @note need raw url function _instance:url_alias(url) - local urls_extra = self:get("__extra_urls") - if urls_extra then - local urlextra = urls_extra[url] - if urlextra then - return urlextra.alias - end - end + return self:extraconf("urls", url, "alias") end -- get the version filter of url, @note need raw url function _instance:url_version(url) - local urls_extra = self:get("__extra_urls") - if urls_extra then - local urlextra = urls_extra[url] - if urlextra then - return urlextra.version - end - end + return self:extraconf("urls", url, "version") end -- get the excludes list of url for the archive extractor, @note need raw url function _instance:url_excludes(url) - local urls_extra = self:get("__extra_urls") - if urls_extra then - local urlextra = urls_extra[url] - if urlextra then - return urlextra.excludes - end - end + return self:extraconf("urls", url, "excludes") end -- get the given dependent package diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 17bb8bac0..7c21947d1 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -25,7 +25,7 @@ import("lib.detect.find_file") -- get configs function _get_configs(package, configs) local configs = configs or {} - if package:plat() == "windows" then + if package:is_plat("windows") then local vs_runtime = package:config("vs_runtime") if vs_runtime then table.insert(configs, '-DCMAKE_CXX_FLAGS_DEBUG="/' .. vs_runtime .. 'd"') |