diff options
| author | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
|---|---|---|
| committer | Thad House <thadhouse1@gmail.com> | 2019-05-31 13:49:13 -0700 |
| commit | 788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b (patch) | |
| tree | 173ade0e6960917458afe9dd9fb0c3c2b7f32051 /toolsrc/include | |
| parent | f483ae4c7fd04eed671a1de595374f84175311e9 (diff) | |
| parent | 26a9338c5055193915290527eacb37f2ac7fdcb8 (diff) | |
| download | vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.tar.gz vcpkg-788af2a75cfddbb9ef4e4217f4c0b506d25f2f3b.zip | |
Merge master
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg/build.h | 7 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/globalstate.h | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/toolsrc/include/vcpkg/build.h b/toolsrc/include/vcpkg/build.h index f27e9d67b..9044cb556 100644 --- a/toolsrc/include/vcpkg/build.h +++ b/toolsrc/include/vcpkg/build.h @@ -51,6 +51,12 @@ namespace vcpkg::Build YES }; + enum class CleanDownloads + { + NO = 0, + YES + }; + enum class ConfigurationType { DEBUG, @@ -82,6 +88,7 @@ namespace vcpkg::Build AllowDownloads allow_downloads; CleanBuildtrees clean_buildtrees; CleanPackages clean_packages; + CleanDownloads clean_downloads; DownloadTool download_tool; BinaryCaching binary_caching; FailOnTombstone fail_on_tombstone; diff --git a/toolsrc/include/vcpkg/globalstate.h b/toolsrc/include/vcpkg/globalstate.h index 2026ea369..263b5f80c 100644 --- a/toolsrc/include/vcpkg/globalstate.h +++ b/toolsrc/include/vcpkg/globalstate.h @@ -13,8 +13,6 @@ namespace vcpkg static Util::LockGuarded<Chrono::ElapsedTimer> timer; static Util::LockGuarded<std::string> g_surveydate; - static std::atomic<bool> debugging; - static std::atomic<bool> feature_packages; static std::atomic<bool> g_binary_caching; static std::atomic<int> g_init_console_cp; |