diff options
| author | myd7349 <myd7349@gmail.com> | 2019-05-27 19:15:06 +0800 |
|---|---|---|
| committer | myd7349 <myd7349@gmail.com> | 2019-05-27 19:15:06 +0800 |
| commit | 8999734b401bb8bac9fa20ce831b2ad2a9a67add (patch) | |
| tree | 3f5cf1d5abbbc4295b556ea6e27882950bdd81f3 /toolsrc/include | |
| parent | a7ac12c90afed0a13e3b24d509927d2fca506115 (diff) | |
| parent | 9ffac4d56eed774419fbb628ea89417a6399db58 (diff) | |
| download | vcpkg-8999734b401bb8bac9fa20ce831b2ad2a9a67add.tar.gz vcpkg-8999734b401bb8bac9fa20ce831b2ad2a9a67add.zip | |
Merge branch 'master' into rdkafka-init
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; |