Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[depend-info] Fix bugs, add --sort, --show-depth and --max-recurse options #7643

Merged
merged 8 commits into from
Aug 14, 2019
Merged

[depend-info] Fix bugs, add --sort, --show-depth and --max-recurse options #7643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de4c394
[depend-info] Follow same rules as vcpkg install
vicroms Aug 11, 2019
69be901
Merge branch 'master' of https://github.com/Microsoft/vcpkg into pr/d…
vicroms Aug 11, 2019
16e4a81
[depend-info] Add --max-depth and --sort options
vicroms Aug 12, 2019
d9068d8
[depend-info] Improve output readability (a tiny bit)
vicroms Aug 12, 2019
68a9d1c
[depend-info] Add --show-depth option
vicroms Aug 12, 2019
a5cec16
Merge branch 'master' of https://github.com/Microsoft/vcpkg into pr/d…
vicroms Aug 12, 2019
7e8b87e
[depend-info] Fix build on VS 2015
vicroms Aug 12, 2019
f518da7
[depend-info] Fix output of --dot and --dgml
vicroms Aug 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion toolsrc/include/vcpkg/base/strings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once


#include <vcpkg/base/cstringview.h>
#include <vcpkg/base/optional.h>
#include <vcpkg/base/stringliteral.h>
Expand Down
2 changes: 1 addition & 1 deletion toolsrc/include/vcpkg/commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace vcpkg::Commands
namespace DependInfo
{
extern const CommandStructure COMMAND_STRUCTURE;
void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
}

namespace Search
Expand Down
2 changes: 1 addition & 1 deletion toolsrc/src/vcpkg/commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace vcpkg::Commands
{"env", &Env::perform_and_exit},
{"build-external", &BuildExternal::perform_and_exit},
{"export", &Export::perform_and_exit},
{"depend-info", &DependInfo::perform_and_exit},
};
return t;
}
Expand All @@ -38,7 +39,6 @@ namespace vcpkg::Commands
{"integrate", &Integrate::perform_and_exit},
{"owns", &Owns::perform_and_exit},
{"update", &Update::perform_and_exit},
{"depend-info", &DependInfo::perform_and_exit},
{"edit", &Edit::perform_and_exit},
{"create", &Create::perform_and_exit},
{"import", &Import::perform_and_exit},
Expand Down
Loading