Skip to content

Commit 87ca37d

Browse files
committed
cli: fix Windows link (run_process_live_to_log) + clean getenv warnings
1 parent 4403f9e commit 87ca37d

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/CLI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <vix/cli/commands/DepsCommand.hpp>
3636
#include <vix/cli/commands/ModulesCommand.hpp>
3737
#include <vix/cli/commands/P2PCommand.hpp>
38-
38+
#include <vix/utils/Env.hpp>
3939
#include <vix/cli/Style.hpp>
4040
#include <vix/utils/Logger.hpp>
4141

@@ -86,7 +86,7 @@ namespace vix
8686

8787
void apply_log_level_from_env(Logger &logger)
8888
{
89-
if (const char *env = std::getenv("VIX_LOG_LEVEL"))
89+
if (const char *env = vix::utils::vix_getenv("VIX_LOG_LEVEL"))
9090
{
9191
std::string value(env);
9292
if (auto lvl = parse_log_level(value))

src/ErrorHandler.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include "vix/cli/errors/ErrorPipeline.hpp"
2020
#include "vix/cli/errors/RawLogDetectors.hpp"
2121
#include "vix/cli/errors/CodeFrame.hpp"
22-
22+
#include <vix/utils/Env.hpp>
2323
#include <iostream>
2424
#include <sstream>
2525
#include <unordered_map>
@@ -78,7 +78,7 @@ namespace
7878

7979
static bool hints_verbose_enabled() noexcept
8080
{
81-
const char *lvl = std::getenv("VIX_LOG_LEVEL");
81+
const char *lvl = vix::utils::vix_getenv("VIX_LOG_LEVEL");
8282
if (!lvl || !*lvl)
8383
return false;
8484

src/cmake/CMakeBuild.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,11 +529,15 @@ namespace vix::cli::build
529529
const std::vector<std::pair<std::string, std::string>> &extraEnv,
530530
const fs::path &logPath,
531531
bool quiet,
532-
bool /*cmakeVerbose*/)
532+
bool cmakeVerbose,
533+
bool progressOnly)
533534
{
534535
process::ExecResult r;
535536
r.displayCommand = util::join_display_cmd(argv);
536537

538+
(void)cmakeVerbose;
539+
(void)progressOnly;
540+
537541
for (const auto &kv : extraEnv)
538542
{
539543
std::string e = kv.first + "=" + kv.second;
@@ -553,7 +557,9 @@ namespace vix::cli::build
553557
r.exitCode = process::normalize_exit_code(raw);
554558

555559
if (!quiet)
560+
{
556561
std::cerr << util::read_text_file_or_empty(logPath);
562+
}
557563

558564
return r;
559565
}

0 commit comments

Comments
 (0)