aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-08-23 22:46:28 -0700
committerRobert Schumacher <roschuma@microsoft.com>2017-08-23 22:46:28 -0700
commitbed70f54bc2dd7181a54bbbb94d2fe3a1a0b35cc (patch)
tree747c9c857106193e337999cfff8790d58e21ac94 /toolsrc/src
parent1081778b849da6c6412379b50ca66d049228c1e7 (diff)
downloadvcpkg-bed70f54bc2dd7181a54bbbb94d2fe3a1a0b35cc.tar.gz
vcpkg-bed70f54bc2dd7181a54bbbb94d2fe3a1a0b35cc.zip
[vcpkg] Add stringify for BuildResult::FILE_CONFLICTS
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg_Build.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg_Build.cpp b/toolsrc/src/vcpkg_Build.cpp
index 124efb7f2..ca89ccf37 100644
--- a/toolsrc/src/vcpkg_Build.cpp
+++ b/toolsrc/src/vcpkg_Build.cpp
@@ -240,6 +240,7 @@ namespace vcpkg::Build
static const std::string NULLVALUE_STRING = Enums::nullvalue_to_string("vcpkg::Commands::Build::BuildResult");
static const std::string SUCCEEDED_STRING = "SUCCEEDED";
static const std::string BUILD_FAILED_STRING = "BUILD_FAILED";
+ static const std::string FILE_CONFLICTS_STRING = "FILE_CONFLICTS";
static const std::string POST_BUILD_CHECKS_FAILED_STRING = "POST_BUILD_CHECKS_FAILED";
static const std::string CASCADED_DUE_TO_MISSING_DEPENDENCIES_STRING = "CASCADED_DUE_TO_MISSING_DEPENDENCIES";
@@ -250,6 +251,7 @@ namespace vcpkg::Build
case BuildResult::BUILD_FAILED: return BUILD_FAILED_STRING;
case BuildResult::POST_BUILD_CHECKS_FAILED: return POST_BUILD_CHECKS_FAILED_STRING;
case BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES: return CASCADED_DUE_TO_MISSING_DEPENDENCIES_STRING;
+ case BuildResult::FILE_CONFLICTS: return FILE_CONFLICTS_STRING;
default: Checks::unreachable(VCPKG_LINE_INFO);
}
}