mirror of
https://github.com/Detanup01/gbe_fork.git
synced 2024-11-27 13:14:01 +08:00
remove custom-cmake otion
This commit is contained in:
parent
4c318d32b2
commit
baeabff6ec
@ -32,15 +32,6 @@ newoption {
|
||||
description = "Cleanup before any action",
|
||||
}
|
||||
|
||||
-- local tools
|
||||
newoption {
|
||||
category = "tools",
|
||||
trigger = "custom-cmake",
|
||||
description = "Use custom cmake",
|
||||
value = 'path/to/cmake.exe',
|
||||
default = nil
|
||||
}
|
||||
|
||||
-- deps extraction
|
||||
newoption {
|
||||
category = "extract",
|
||||
@ -153,17 +144,12 @@ local third_party_common_dir = path.join(third_party_dir, 'deps', 'common')
|
||||
local extractor = os.realpath(path.join(third_party_deps_dir, '7za', '7za'))
|
||||
local mycmake = os.realpath(path.join(third_party_deps_dir, 'cmake', 'bin', 'cmake'))
|
||||
|
||||
if _OPTIONS["custom-cmake"] then
|
||||
mycmake = _OPTIONS["custom-cmake"]
|
||||
print('using custom cmake: ' .. _OPTIONS["custom-cmake"])
|
||||
else
|
||||
if os.host() == 'windows' then
|
||||
mycmake = mycmake .. '.exe'
|
||||
end
|
||||
if not os.isfile(mycmake) then
|
||||
error('cmake is missing from third-party dir, you can specify custom cmake location, run the script with --help. cmake: ' .. mycmake)
|
||||
end
|
||||
end
|
||||
|
||||
if not third_party_dir or not os.isdir(third_party_dir) then
|
||||
error('third-party dir is missing')
|
||||
@ -358,14 +344,12 @@ if os.host() == "linux" then
|
||||
return
|
||||
end
|
||||
|
||||
if not _OPTIONS["custom-cmake"] then
|
||||
local ok_chmod, err_chmod = os.chmod(mycmake, "777")
|
||||
if not ok_chmod then
|
||||
error("cannot chmod: " .. err_chmod)
|
||||
return
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
-- extract action
|
||||
|
Loading…
Reference in New Issue
Block a user