diff options
| author | ruki <[email protected]> | 2020-02-21 00:49:31 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-02-20 22:57:10 +0800 |
| commit | c96c6f1eecd363f3406af262122a272c1ca13965 (patch) | |
| tree | c318e624cb6b6a7071f2b31f423d4aa1e3a6cb4b | |
| parent | 12d44e1e32132c859df769247d8e459388071bb5 (diff) | |
improve verbose switch
| -rw-r--r-- | xmake/modules/private/action/trybuild/cmake.lua | 4 | ||||
| -rw-r--r-- | xmake/modules/private/action/trybuild/make.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/private/action/trybuild/meson.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/private/action/trybuild/ninja.lua | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/xmake/modules/private/action/trybuild/cmake.lua b/xmake/modules/private/action/trybuild/cmake.lua index a1901e2d2..46d2fbcf6 100644 --- a/xmake/modules/private/action/trybuild/cmake.lua +++ b/xmake/modules/private/action/trybuild/cmake.lua @@ -46,7 +46,7 @@ function _get_configs(artifacts_dir) end -- enable verbose? - if option.get("verbose") or option.get("diagnosis") then + if option.get("verbose") then table.insert(configs, "-DCMAKE_VERBOSE_MAKEFILE=ON") end @@ -115,7 +115,7 @@ function build() end else local argv = {"-j" .. option.get("jobs")} - if option.get("verbose") or option.get("diagnosis") then + if option.get("verbose") then table.insert(argv, "VERBOSE=1") end os.vexecv("make", argv) diff --git a/xmake/modules/private/action/trybuild/make.lua b/xmake/modules/private/action/trybuild/make.lua index 8224298a7..35a02c7f2 100644 --- a/xmake/modules/private/action/trybuild/make.lua +++ b/xmake/modules/private/action/trybuild/make.lua @@ -41,7 +41,7 @@ end function build() assert(is_subhost(config.plat()), "make: %s not supported!", config.plat()) local argv = {} - if option.get("verbose") or option.get("diagnosis") then + if option.get("verbose") then table.insert(argv, "VERBOSE=1") end if is_subhost("windows") then diff --git a/xmake/modules/private/action/trybuild/meson.lua b/xmake/modules/private/action/trybuild/meson.lua index 9967cb467..dc2f30238 100644 --- a/xmake/modules/private/action/trybuild/meson.lua +++ b/xmake/modules/private/action/trybuild/meson.lua @@ -106,7 +106,7 @@ function build() -- do build local ninja = assert(find_tool("ninja"), "ninja not found!") local ninja_argv = {"-C", buildir} - if option.get("verbose") or option.get("diagnosis") then + if option.get("verbose") then table.insert(ninja_argv, "-v") end table.insert(ninja_argv, "-j") diff --git a/xmake/modules/private/action/trybuild/ninja.lua b/xmake/modules/private/action/trybuild/ninja.lua index 68c0901ae..0dfd7c8c1 100644 --- a/xmake/modules/private/action/trybuild/ninja.lua +++ b/xmake/modules/private/action/trybuild/ninja.lua @@ -45,7 +45,7 @@ end function build() local ninja = assert(find_tool("ninja"), "ninja not found!") local ninja_argv = {"-C", os.curdir()} - if option.get("verbose") or option.get("diagnosis") then + if option.get("verbose") then table.insert(ninja_argv, "-v") end table.insert(ninja_argv, "-j") |
