From 2d63525a154cf6aba8db2014792eec62087fe1e6 Mon Sep 17 00:00:00 2001 From: ivysnow Date: Tue, 8 Jan 2019 08:03:35 +0800 Subject: [vcpkg] add support for FreeBSD (#4917) * [vcpkg] add support for FreeBSD * [x64-freebsd] Remove triplet because it is not currently in the set of supported triplets --- toolsrc/src/vcpkg/metrics.cpp | 2 ++ toolsrc/src/vcpkg/tools.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'toolsrc/src') diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 2a73dba89..c34f30974 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -220,6 +220,8 @@ namespace vcpkg::Metrics "OSX", #elif defined(__linux__) "Linux", +#elif defined(__FreeBSD__) + "FreeBSD", #elif defined(__unix__) "Unix", #else diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 365271872..b713b2752 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -52,11 +52,13 @@ namespace vcpkg static constexpr StringLiteral OS_STRING = "osx"; #elif defined(__linux__) static constexpr StringLiteral OS_STRING = "linux"; +#elif defined(__FreeBSD__) + static constexpr StringLiteral OS_STRING = "freebsd"; #else return std::string("operating system is unknown"); #endif -#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) +#if defined(_WIN32) || defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) static const std::string XML_VERSION = "2"; static const fs::path XML_PATH = paths.scripts / "vcpkgTools.xml"; static const std::regex XML_VERSION_REGEX {R"###()###"}; -- cgit v1.2.3