Skip to content
This repository was archived by the owner on Apr 23, 2020. It is now read-only.

Commit 778ed9c

Browse files
jmarrecCroydon
authored andcommitted
Support MSVC 19
1 parent 2e3aa72 commit 778ed9c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

conanfile.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,8 @@ def package_info(self):
164164
debug_suffix = 'd' if self.settings.build_type == 'Debug' else ''
165165
toolset = {'12': '120',
166166
'14': '140',
167-
'15': '141'}.get(str(self.settings.compiler.version))
167+
'15': '141',
168+
'16': '142'}.get(str(self.settings.compiler.version))
168169
version_tokens = self.version.split(".")
169170
versioned_name = "cpprest%s_%s_%s%s" % (toolset, version_tokens[0], version_tokens[1], debug_suffix)
170171
# CppRestSDK uses different library name depends on CMAKE_VS_PLATFORM_TOOLSET

test_package/test_package.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
int main()
44
{
5-
const auto parsed_value = web::json::value::parse(U("-22"));
5+
const auto parsed_value = web::json::value::parse(U("-22"));
66
}

0 commit comments

Comments
 (0)