diff options
| author | ruki <[email protected]> | 2019-06-11 23:02:37 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2019-06-11 12:15:45 +0800 |
| commit | 62f4a6f00af4d3d2cc7b20e29ff931b1373e5570 (patch) | |
| tree | 0177812bcd11c9aa852c6b9df8f21ae8ddaf669a | |
| parent | 0708b41747a388e1d055de9cdba8b4a3d64203e0 (diff) | |
improve find_qt and wdk
| -rw-r--r-- | xmake/modules/detect/sdks/find_qt.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_wdk.lua | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua index 885198575..6ab39b254 100644 --- a/xmake/modules/detect/sdks/find_qt.lua +++ b/xmake/modules/detect/sdks/find_qt.lua @@ -153,9 +153,9 @@ function main(sdkdir, opt) opt = opt or {} -- attempt to load cache first - local key = "detect.sdks.find_qt." .. (sdkdir or "") + local key = "detect.sdks.find_qt" local cacheinfo = cache.load(key) - if not opt.force and cacheinfo.qt then + if not opt.force and cacheinfo.qt and cacheinfo.qt.sdkdir and os.isdir(cacheinfo.qt.sdkdir) then return cacheinfo.qt end diff --git a/xmake/modules/detect/sdks/find_wdk.lua b/xmake/modules/detect/sdks/find_wdk.lua index 513be1f88..e19befd02 100644 --- a/xmake/modules/detect/sdks/find_wdk.lua +++ b/xmake/modules/detect/sdks/find_wdk.lua @@ -160,9 +160,9 @@ function main(sdkdir, opt) opt = opt or {} -- attempt to load cache first - local key = "detect.sdks.find_wdk." .. (sdkdir or "") + local key = "detect.sdks.find_wdk" local cacheinfo = cache.load(key) - if not opt.force and cacheinfo.wdk then + if not opt.force and cacheinfo.wdk and cacheinfo.wdk.sdkdir and os.isdir(cacheinfo.wdk.sdkdir) then return cacheinfo.wdk end |