diff options
| author | Phil Christensen <philc@microsoft.com> | 2019-01-11 12:44:31 -0800 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-11 12:44:31 -0800 |
| commit | 57c78037a4a8f0f7384504475c5510984657f0d2 (patch) | |
| tree | 91928048e7001ea224d68da54d9bb43cbbd7970f /toolsrc/src | |
| parent | bf4a864a73dfe0f68a70598c9f5087beca57f2c7 (diff) | |
| parent | 1134de5eacf2052a936a943acea7f08ba06462d7 (diff) | |
| download | vcpkg-57c78037a4a8f0f7384504475c5510984657f0d2.tar.gz vcpkg-57c78037a4a8f0f7384504475c5510984657f0d2.zip | |
Merge branch 'master' into dev/philc/4990
Diffstat (limited to 'toolsrc/src')
| -rw-r--r-- | toolsrc/src/vcpkg/metrics.cpp | 2 | ||||
| -rw-r--r-- | toolsrc/src/vcpkg/tools.cpp | 4 |
2 files changed, 5 insertions, 1 deletions
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"###(<tools[\s]+version="([^"]+)">)###"}; |