From 2254f84002a7df1f299ba56e81e6b37fb7738878 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Wed, 31 Mar 2021 15:09:39 +0200 Subject: [PATCH] assimp: fix usage with static libc++ --- recipes/assimp/5.0.x/conanfile.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/recipes/assimp/5.0.x/conanfile.py b/recipes/assimp/5.0.x/conanfile.py index 573390e01c822..2b7a011fd3ce7 100644 --- a/recipes/assimp/5.0.x/conanfile.py +++ b/recipes/assimp/5.0.x/conanfile.py @@ -155,15 +155,8 @@ def package_info(self): self.cpp_info.libs = tools.collect_libs(self) if self.settings.os == "Linux": self.cpp_info.system_libs = ["rt", "m", "pthread"] - if not self.options.shared and self._stdcpp_library: - self.cpp_info.system_libs.append(self._stdcpp_library) + if not self.options.shared: + stdcpp_library = tools.stdcpp_library(self) + if stdcpp_library: + self.cpp_info.system_libs.append(stdcpp_library) - @property - def _stdcpp_library(self): - libcxx = self.settings.get_safe("compiler.libcxx") - if libcxx in ("libstdc++", "libstdc++11"): - return "stdc++" - elif libcxx in ("libc++",): - return "c++" - else: - return False