aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2021-01-21 08:58:11 -0800
committerGitHub <noreply@github.com>2021-01-21 08:58:11 -0800
commitbedeaa639c21a759ad211b048deb7968a6648f10 (patch)
tree734603a897ff891ddb08977bb5cc1e67b66a7e80 /toolsrc/src
parentd0268cf16649ffb8b847b719a9cab224623291ff (diff)
downloadvcpkg-bedeaa639c21a759ad211b048deb7968a6648f10.tar.gz
vcpkg-bedeaa639c21a759ad211b048deb7968a6648f10.zip
[osgearth] Make all find_packages required in effort to make this port less "flaky", and turn on in CI. (#15777)
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg/platform-expression.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/toolsrc/src/vcpkg/platform-expression.cpp b/toolsrc/src/vcpkg/platform-expression.cpp
index 034ee6bd5..a6177c85f 100644
--- a/toolsrc/src/vcpkg/platform-expression.cpp
+++ b/toolsrc/src/vcpkg/platform-expression.cpp
@@ -32,6 +32,7 @@ namespace vcpkg::PlatformExpression
ios,
static_link,
+ static_crt,
};
static Identifier string2identifier(StringView name)
@@ -51,6 +52,7 @@ namespace vcpkg::PlatformExpression
{"emscripten", Identifier::emscripten},
{"ios", Identifier::ios},
{"static", Identifier::static_link},
+ {"staticcrt", Identifier::static_link},
};
auto id_pair = id_map.find(name);
@@ -398,6 +400,7 @@ namespace vcpkg::PlatformExpression
case Identifier::wasm32: return true_if_exists_and_equal("VCPKG_TARGET_ARCHITECTURE", "wasm32");
case Identifier::static_link:
return true_if_exists_and_equal("VCPKG_LIBRARY_LINKAGE", "static");
+ case Identifier::static_crt: return true_if_exists_and_equal("VCPKG_CRT_LINKAGE", "static");
default: Checks::unreachable(VCPKG_LINE_INFO);
}
}