Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: add msstl to the default settings for Clang on Windows (clang-cl) #4253

Closed
wants to merge 2 commits into from
Closed

Feature: add msstl to the default settings for Clang on Windows (clang-cl) #4253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1020d68
- add msstl to the default settings for Clang on Windows (clang-cl)
SSE4 Jan 8, 2019
ef688df
Merge branch 'develop' into clangcl_msstl
SSE4 Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion conans/client/conf/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0",
"5.0", "6.0", "7.0",
"8"]
libcxx: [libstdc++, libstdc++11, libc++]
libcxx: [libstdc++, libstdc++11, libc++, msstl]
apple-clang:
version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0"]
libcxx: [libstdc++, libc++]
Expand Down
2 changes: 2 additions & 0 deletions conans/client/conf/detect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ def _detect_compiler_version(result, output):
elif compiler == "clang":
if platform.system() == "FreeBSD":
result.append(("compiler.libcxx", "libc++"))
elif platform.system() == "Windows":
result.append(("compiler.libcxx", "msstl"))
else:
result.append(("compiler.libcxx", "libstdc++"))
elif compiler == "sun-cc":
Expand Down
2 changes: 1 addition & 1 deletion conans/client/migrations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def _make_migrations(self, old_version):
version: ["3.3", "3.4", "3.5", "3.6", "3.7", "3.8", "3.9", "4.0",
"5.0", "6.0", "7.0",
"8"]
libcxx: [libstdc++, libstdc++11, libc++]
libcxx: [libstdc++, libstdc++11, libc++, msstl]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These are the "old" settings from the previous version. Doesn't make sense to change them here.

apple-clang:
version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", "10.0"]
libcxx: [libstdc++, libc++]
Expand Down