Skip to content

Commit

Permalink
[MesonToolchain] Removed package_folder check (#13132)
Browse files Browse the repository at this point in the history
Fixed bug in Linux
  • Loading branch information
franramirez688 committed Feb 15, 2023
1 parent ec2aa42 commit 1487eab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
3 changes: 0 additions & 3 deletions conan/tools/meson/toolchain.py
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
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()

0 comments on commit 1487eab

Please sign in to comment.