diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-30 12:45:26 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-30 21:52:43 -0800 |
| commit | 4d104541674f1975b60c2ccd694d447e25a16359 (patch) | |
| tree | cb94aa901e50763f872f05597cdbe58ab6bab7a6 | |
| parent | 884cd176b05a76e7fbba924685a0d71c3dea0f9b (diff) | |
| download | vcpkg-4d104541674f1975b60c2ccd694d447e25a16359.tar.gz vcpkg-4d104541674f1975b60c2ccd694d447e25a16359.zip | |
Add package_spec::display_name()
| -rw-r--r-- | toolsrc/include/package_spec.h | 2 | ||||
| -rw-r--r-- | toolsrc/src/BinaryParagraph.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/package_spec.cpp | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/toolsrc/include/package_spec.h b/toolsrc/include/package_spec.h index b469567c7..1bc493756 100644 --- a/toolsrc/include/package_spec.h +++ b/toolsrc/include/package_spec.h @@ -15,6 +15,8 @@ namespace vcpkg const triplet& target_triplet() const; + std::string display_name() const; + std::string dir() const; std::string toString() const; diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index eed87eb81..f949677a3 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -71,7 +71,7 @@ namespace vcpkg std::string BinaryParagraph::displayname() const { - return Strings::format("%s:%s", this->spec.name(), this->spec.target_triplet()); + return this->spec.display_name(); } std::string BinaryParagraph::dir() const diff --git a/toolsrc/src/package_spec.cpp b/toolsrc/src/package_spec.cpp index 7d8d2681d..2713e219f 100644 --- a/toolsrc/src/package_spec.cpp +++ b/toolsrc/src/package_spec.cpp @@ -50,6 +50,11 @@ namespace vcpkg return this->m_target_triplet; } + std::string package_spec::display_name() const + { + return Strings::format("%s:%s", this->name(), this->target_triplet()); + } + std::string package_spec::dir() const { return Strings::format("%s_%s", this->m_name, this->m_target_triplet); @@ -57,7 +62,7 @@ namespace vcpkg std::string package_spec::toString() const { - return Strings::format("%s:%s", this->name(), this->target_triplet()); + return this->display_name(); } std::string to_printf_arg(const package_spec& spec) |