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

[MesonToolchain] Removed package_folder check #13132

Merged
merged 1 commit into from
Feb 15, 2023
Merged

[MesonToolchain] Removed package_folder check #13132

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
3 changes: 0 additions & 3 deletions conan/tools/meson/toolchain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,6 @@ def _get_cpp_info_value(name):
elements = getattr(self._conanfile.cpp.package, name)
return elements[0] if elements else None

if not self._conanfile.package_folder:
return {}

ret = {}
bindir = _get_cpp_info_value("bindirs")
datadir = _get_cpp_info_value("resdirs")
Expand Down
7 changes: 6 additions & 1 deletion conans/test/functional/toolchains/meson/test_install.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ def test_install(self):
os.path.join("test_package", "CMakeLists.txt"): self._test_package_cmake_lists,
os.path.join("test_package", "test_package.cpp"): test_package_cpp})

self.t.run("create . hello/0.1@ %s" % self._settings_str)
# FIXME: Remove this and run a "conan create ..." instead whenever there will be tests with
# export-pkg command running automatically the test_package as well.
self.t.run("install .")
self.t.run("build .")
self.t.run("export-pkg . hello/0.1@ %s" % self._settings_str)
self.t.run("test test_package/conanfile.py hello/0.1@ %s" % self._settings_str)

self._check_binary()