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

Update expected skip condition for llvm framework test on msys2 #9591

Merged
merged 2 commits into from
Nov 20, 2021
Merged

Update expected skip condition for llvm framework test on msys2 #9591

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
b6111de
Update expected skip condition for llvm framework test on msys2
jon-turney Nov 18, 2021
d577f0d
cmake: Use find_library() on bare library names in cmake dependencies
jon-turney Nov 18, 2021
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
10 changes: 4 additions & 6 deletions mesonbuild/dependencies/cmake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,12 +617,10 @@ def _detect_dep(self, name: str, package_version: str, modules: T.List[T.Tuple[s
libraries += [j]
elif self.env.machines.build.is_windows() and reg_is_maybe_bare_lib.match(j):
# On Windows, CMake library dependencies can be passed as bare library names,
# e.g. 'version' should translate into 'version.lib'. CMake brute-forces a
# combination of prefix/suffix combinations to find the right library, however
# as we do not have a compiler environment available to us, we cannot do the
# same, but must assume any bare argument passed which is not also a CMake
# target must be a system library we should try to link against
libraries += [f"{j}.lib"]
# CMake brute-forces a combination of prefix/suffix combinations to find the
# right library. Assume any bare argument passed which is not also a CMake
# target must be a system library we should try to link against.
libraries += self.clib_compiler.find_library(j, self.env, [])
else:
mlog.warning('CMake: Dependency', mlog.bold(j), 'for', mlog.bold(name), 'target', mlog.bold(self._original_module_name(curr)), 'was not found')

Expand Down
2 changes: 1 addition & 1 deletion test cases/frameworks/15 llvm/test.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"options": {
"method": [
{ "val": "config-tool", "skip_on_jobname": ["msys2-gcc"]},
{ "val": "cmake", "skip_on_jobname": ["msys2"] }
{ "val": "cmake", "skip_on_jobname": ["msys2-gcc"] }
],
"link-static": [
{ "val": true, "skip_on_jobname": ["opensuse"] },
Expand Down