diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-09-23 12:20:09 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-09-23 12:20:09 -0700 |
| commit | 8a8180503d8217959d96a9f2b9fc6366d67c1354 (patch) | |
| tree | 71f299f461d4c726a5cf49a535b42898149caccc /toolsrc/include | |
| parent | b2f6a769ea015f49c7061e36c8c7125dd53ca01e (diff) | |
| parent | ddd0f88579eb1adff0dd8b14458c4bf70eaa902d (diff) | |
| download | vcpkg-8a8180503d8217959d96a9f2b9fc6366d67c1354.tar.gz vcpkg-8a8180503d8217959d96a9f2b9fc6366d67c1354.zip | |
Merge branch 'alzie-default_triplet'
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/triplet.h | 4 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_cmd_arguments.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h index f9d1e9483..0c42f2ec7 100644 --- a/toolsrc/include/triplet.h +++ b/toolsrc/include/triplet.h @@ -4,6 +4,8 @@ namespace vcpkg { + struct vcpkg_paths; + struct triplet { static const triplet X86_WINDOWS; @@ -17,6 +19,8 @@ namespace vcpkg std::string architecture() const; std::string system() const; + + bool validate(const vcpkg_paths& paths); }; bool operator==(const triplet& left, const triplet& right); diff --git a/toolsrc/include/vcpkg_cmd_arguments.h b/toolsrc/include/vcpkg_cmd_arguments.h index 7df3d64b1..704290589 100644 --- a/toolsrc/include/vcpkg_cmd_arguments.h +++ b/toolsrc/include/vcpkg_cmd_arguments.h @@ -27,7 +27,7 @@ namespace vcpkg std::unordered_set<std::string> check_and_get_optional_command_arguments(const std::vector<std::string>& valid_options) const; void check_max_args(size_t arg_count, const char* example_text = nullptr) const; - std::vector<package_spec> parse_all_arguments_as_package_specs(const triplet& default_target_triplet, const char* example_text = nullptr) const; + std::vector<package_spec> parse_all_arguments_as_package_specs(const vcpkg_paths& paths, const triplet& default_target_triplet, const char* example_text = nullptr) const; private: std::unordered_set<std::string> optional_command_arguments; |