From 1487eabafa5cc458ce8a3c7c144a127b2d332026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francisco=20Ram=C3=ADrez?= Date: Wed, 15 Feb 2023 11:02:44 +0100 Subject: [PATCH] [MesonToolchain] Removed `package_folder` check (#13132) Fixed bug in Linux --- conan/tools/meson/toolchain.py | 3 --- conans/test/functional/toolchains/meson/test_install.py | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conan/tools/meson/toolchain.py b/conan/tools/meson/toolchain.py index d4e808f1629..dcb7d06f95e 100644 --- a/conan/tools/meson/toolchain.py +++ b/conan/tools/meson/toolchain.py @@ -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") diff --git a/conans/test/functional/toolchains/meson/test_install.py b/conans/test/functional/toolchains/meson/test_install.py index e61f75adcb3..c3b0d4275b8 100644 --- a/conans/test/functional/toolchains/meson/test_install.py +++ b/conans/test/functional/toolchains/meson/test_install.py @@ -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()