diff options
| author | ras0219 <533828+ras0219@users.noreply.github.com> | 2020-08-13 18:36:33 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-13 18:36:33 -0700 |
| commit | 0b5bbe30d940c597242cefa899dc93168054e466 (patch) | |
| tree | a02a36758c8d4f794194dd37b48a7649fc143ee3 /toolsrc/src/vcpkg.cpp | |
| parent | 5bb91a9452c2155e8ccd69c88629af24507249d4 (diff) | |
| download | vcpkg-0b5bbe30d940c597242cefa899dc93168054e466.tar.gz vcpkg-0b5bbe30d940c597242cefa899dc93168054e466.zip | |
[vcpkg] Lift `--x-json` to a global option, implement experimental `x-package-info` command (#12845)
* [vcpkg] Improve error reporting in vcpkg::Json
* [vcpkg] Lift --x-json to a common option
* [vcpkg] Address warnings-as-errors in VS2015
* [vcpkg] Remove unused local
* [vcpkg] Extract vcpkg::Install::get_cmake_usage
* [vcpkg] Implement vcpkg::serialize_ipv(ipv, paths)
* [vcpkg] Implement x-package-info to enable tooling
* [vcpkg] Fixup tests to respect new cli mode
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index 0158b3755..d0df8749f 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -77,7 +77,9 @@ static void inner(vcpkg::Files::Filesystem& fs, const VcpkgCmdArguments& args) paths.track_feature_flag_metrics(); fs.current_path(paths.root, VCPKG_LINE_INFO); - if (args.command == "install" || args.command == "remove" || args.command == "export" || args.command == "update") + if ((args.command == "install" || args.command == "remove" || args.command == "export" || + args.command == "update") && + !args.output_json()) { Commands::Version::warn_if_vcpkg_version_mismatch(paths); std::string surveydate = *GlobalState::g_surveydate.lock(); |