diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-08-23 16:17:53 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-08-24 16:29:40 -0700 |
| commit | e237682cad4eaa582a10b5ad03a59ca6449e0795 (patch) | |
| tree | 6850152901be7ab8ea7462fac572850d68a2dbde /toolsrc/src/vcpkg_Build.cpp | |
| parent | 8fc510e1f946208409bd8ba1159b2e19bf553909 (diff) | |
| download | vcpkg-e237682cad4eaa582a10b5ad03a59ca6449e0795.tar.gz vcpkg-e237682cad4eaa582a10b5ad03a59ca6449e0795.zip | |
Introduce GlobalState struct
Diffstat (limited to 'toolsrc/src/vcpkg_Build.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg_Build.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/toolsrc/src/vcpkg_Build.cpp b/toolsrc/src/vcpkg_Build.cpp index ca89ccf37..d4632afaa 100644 --- a/toolsrc/src/vcpkg_Build.cpp +++ b/toolsrc/src/vcpkg_Build.cpp @@ -8,6 +8,7 @@ #include "vcpkg_Chrono.h" #include "vcpkg_Commands.h" #include "vcpkg_Enums.h" +#include "vcpkg_GlobalState.h" #include "vcpkg_System.h" #include "vcpkg_optional.h" #include "vcpkglib.h" @@ -77,7 +78,7 @@ namespace vcpkg::Build std::wstring make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset) { const wchar_t* tonull = L" >nul"; - if (g_debugging) + if (GlobalState::debugging) { tonull = L""; } @@ -155,7 +156,7 @@ namespace vcpkg::Build const auto cmd_set_environment = make_build_env_cmd(pre_build_info, toolset); std::string features; - if (g_feature_packages) + if (GlobalState::feature_packages) { if (config.feature_list) { @@ -212,7 +213,7 @@ namespace vcpkg::Build { return {BuildResult::POST_BUILD_CHECKS_FAILED, {}}; } - if (g_feature_packages) + if (GlobalState::feature_packages) { if (config.feature_list) { |