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

Sail: fix Windows/Clang build #25480

Closed
wants to merge 1 commit into from
Closed

Sail: fix Windows/Clang build #25480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion recipes/sail/all/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ class SAILConan(ConanFile):
"with_low_priority_codecs": "Enable codecs: ICO, PCX, PNM, PSD, QOI, TGA",
"with_lowest_priority_codecs": "Enable codecs: WAL, XBM",
}

@property
def _is_clang_cl(self):
return self.settings.os == "Windows" and self.settings.compiler == "clang"

def export_sources(self):
export_conandata_patches(self)
Expand Down Expand Up @@ -109,7 +113,7 @@ def generate(self):
tc.variables["SAIL_INSTALL_PDB"] = False
tc.variables["SAIL_THREAD_SAFE"] = self.options.thread_safe
# TODO: Remove after fixing https://github.com/conan-io/conan/issues/12012
if is_msvc(self):
if is_msvc(self) or self._is_clang_cl:
tc.cache_variables["CMAKE_TRY_COMPILE_CONFIGURATION"] = str(self.settings.build_type)
tc.generate()

Expand Down
Binary file added recipes/sail/d
View file
Open in desktop
Binary file not shown.