diff options
| author | ruki <[email protected]> | 2018-03-20 22:38:56 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-03-20 09:53:40 +0800 |
| commit | 90137767d7c9b241afe9443a6c261f362d97fd0c (patch) | |
| tree | 29579d9b9d41243fc3de399d6dcc27014a2dcdde /xmake/modules/detect | |
| parent | b8ef04349bfa1441d4e4aa8e8ff138da2f7edf39 (diff) | |
rename sdk detect modules
Diffstat (limited to 'xmake/modules/detect')
| -rw-r--r-- | xmake/modules/detect/sdks/find_cuda.lua (renamed from xmake/modules/detect/sdks/find_cuda_toolchains.lua) | 4 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_ndk.lua (renamed from xmake/modules/detect/sdks/find_ndk_toolchains.lua) | 0 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_xcode.lua (renamed from xmake/modules/detect/sdks/find_xcode_dir.lua) | 4 | ||||
| -rw-r--r-- | xmake/modules/detect/sdks/find_xcode_sdkvers.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/detect/tools/find_nvcc.lua | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/xmake/modules/detect/sdks/find_cuda_toolchains.lua b/xmake/modules/detect/sdks/find_cuda.lua index 534b570ac..16e66107f 100644 --- a/xmake/modules/detect/sdks/find_cuda_toolchains.lua +++ b/xmake/modules/detect/sdks/find_cuda.lua @@ -19,7 +19,7 @@ -- Copyright (C) 2015 - 2018, TBOOX Open Source Group. -- -- @author ruki --- @file find_cuda_toolchains.lua +-- @file find_cuda.lua -- -- imports @@ -54,7 +54,7 @@ end -- -- @code -- --- local toolchains = find_cuda_toolchains("/Developer/NVIDIA/CUDA-9.1") +-- local toolchains = find_cuda("/Developer/NVIDIA/CUDA-9.1") -- -- @endcode -- diff --git a/xmake/modules/detect/sdks/find_ndk_toolchains.lua b/xmake/modules/detect/sdks/find_ndk.lua index 235466661..235466661 100644 --- a/xmake/modules/detect/sdks/find_ndk_toolchains.lua +++ b/xmake/modules/detect/sdks/find_ndk.lua diff --git a/xmake/modules/detect/sdks/find_xcode_dir.lua b/xmake/modules/detect/sdks/find_xcode.lua index a15182b84..143161c1a 100644 --- a/xmake/modules/detect/sdks/find_xcode_dir.lua +++ b/xmake/modules/detect/sdks/find_xcode.lua @@ -19,7 +19,7 @@ -- Copyright (C) 2015 - 2018, TBOOX Open Source Group. -- -- @author ruki --- @file find_xcode_dir.lua +-- @file find_xcode.lua -- -- imports @@ -31,7 +31,7 @@ import("lib.detect.find_directory") -- -- @code -- --- local xcode_dir = find_xcode_dir() +-- local xcode_dir = find_xcode() -- -- @endcode -- diff --git a/xmake/modules/detect/sdks/find_xcode_sdkvers.lua b/xmake/modules/detect/sdks/find_xcode_sdkvers.lua index 3cc514201..adb327b79 100644 --- a/xmake/modules/detect/sdks/find_xcode_sdkvers.lua +++ b/xmake/modules/detect/sdks/find_xcode_sdkvers.lua @@ -24,7 +24,7 @@ -- imports import("core.project.config") -import("detect.sdks.find_xcode_dir") +import("detect.sdks.find_xcode") -- find xcode sdk versions for the given platform -- @@ -48,7 +48,7 @@ function main(opt) -- get xcode directory local xcode_sdkvers = {} - local xcode_dir = opt.xcode_dir or find_xcode_dir() + local xcode_dir = opt.xcode_dir or find_xcode() if not xcode_dir or not os.isdir(xcode_dir) then return xcode_sdkvers end diff --git a/xmake/modules/detect/tools/find_nvcc.lua b/xmake/modules/detect/tools/find_nvcc.lua index 6e361dd9c..3569c7172 100644 --- a/xmake/modules/detect/tools/find_nvcc.lua +++ b/xmake/modules/detect/tools/find_nvcc.lua @@ -26,7 +26,7 @@ import("core.project.config") import("lib.detect.find_program") import("lib.detect.find_programver") -import("detect.sdks.find_cuda_toolchains") +import("detect.sdks.find_cuda") -- find nvcc -- @@ -52,7 +52,7 @@ function main(opt) -- not found? attempt to find program from cuda toolchains if not program then - local toolchains = find_cuda_toolchains(config.get("cuda_dir")) + local toolchains = find_cuda(config.get("cuda_dir")) if toolchains and toolchains.bindir then program = find_program(path.join(toolchains.bindir, "nvcc"), opt) end |
