mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 18:32:47 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Improve default triplets for non-windows

Browse Source
This commit is contained in:
Robert Schumacher 2018-03-13 11:06:22 -07:00
parent 6b7c48646b
commit 3c7997215b
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/include/vcpkg/base/strings.h
View File

@ -46,7 +46,7 @@ namespace vcpkg::Strings
bool case_insensitive_ascii_equals(const CStringView left, const CStringView right); bool case_insensitive_ascii_equals(const CStringView left, const CStringView right);
std::string ascii_to_lowercase(const std::string& input); std::string ascii_to_lowercase(std::string input);
bool case_insensitive_ascii_starts_with(const std::string& s, const std::string& pattern); bool case_insensitive_ascii_starts_with(const std::string& s, const std::string& pattern);

8
toolsrc/src/vcpkg.cpp
View File

@ -157,7 +157,15 @@ static void inner(const VcpkgCmdArguments& args)
} }
else else
{ {
#if defined(_WIN32)
default_triplet = Triplet::X86_WINDOWS; default_triplet = Triplet::X86_WINDOWS;
#elif defined(__APPLE__)
default_triplet = Triplet::from_canonical_name("x64-osx");
#elif defined(__FreeBSD__)
default_triplet = Triplet::from_canonical_name("x64-freebsd");
#else
default_triplet = Triplet::from_canonical_name("x64-linux");
#endif
} }
} }

7
toolsrc/src/vcpkg/base/strings.cpp
View File

@ -108,11 +108,10 @@ namespace vcpkg::Strings
#endif #endif
} }
std::string ascii_to_lowercase(const std::string& input) std::string ascii_to_lowercase(std::string s)
{ {
std::string output(input); std::transform(s.begin(), s.end(), s.begin(), &details::tolower_char);
std::transform(output.begin(), output.end(), output.begin(), &details::tolower_char); return s;
return output;
} }
bool case_insensitive_ascii_starts_with(const std::string& s, const std::string& pattern) bool case_insensitive_ascii_starts_with(const std::string& s, const std::string& pattern)