diff options
| author | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2016-09-23 09:44:30 +0200 |
|---|---|---|
| committer | Albert Ziegenhagel <albert.ziegenhagel@outlook.com> | 2016-09-23 09:44:30 +0200 |
| commit | 31935aa0fd142cbb4e0db1a62ba1483294b740f8 (patch) | |
| tree | 41be4e9498a385ecc8796d9158bf871c07ecdbc1 /toolsrc/include | |
| parent | 4a818b6a3e86514af27381fe16dcf311a5c28ffb (diff) | |
| download | vcpkg-31935aa0fd142cbb4e0db1a62ba1483294b740f8.tar.gz vcpkg-31935aa0fd142cbb4e0db1a62ba1483294b740f8.zip | |
Improved error reporting when user provides invalid triplets
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 0df3d1222..5a5075d23 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; std::vector<package_spec> extract_package_specs_with_unmet_dependencies(const vcpkg_paths& paths, const triplet& default_target_triplet, const StatusParagraphs& status_db) const; private: |