From 4d3c98cb62b5523254e8642ba0fc7ba935037c64 Mon Sep 17 00:00:00 2001 From: Martin Valgur Date: Mon, 9 Sep 2024 15:48:27 +0300 Subject: [PATCH] mysql-connector-cpp: tidy system_libs --- recipes/mysql-connector-cpp/all/conanfile.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/recipes/mysql-connector-cpp/all/conanfile.py b/recipes/mysql-connector-cpp/all/conanfile.py index 8892e72dc2cc4d..11f604adb653e2 100644 --- a/recipes/mysql-connector-cpp/all/conanfile.py +++ b/recipes/mysql-connector-cpp/all/conanfile.py @@ -153,16 +153,12 @@ def package_info(self): if self.settings.os == "Windows": self.cpp_info.system_libs.extend(["dnsapi", "ws2_32"]) - elif self.settings.os != "FreeBSD": - self.cpp_info.system_libs.append("resolv") + if self.settings.os in ["Linux", "FreeBSD"]: + self.cpp_info.system_libs.extend(["m", "pthread", "dl"]) if self.settings.os == "SunOS": self.cpp_info.system_libs.append(["socket", "nsl"]) + if self.settings.os not in ["Windows", "FreeBSD"]: + self.cpp_info.system_libs.append("resolv") if not self.options.shared: self.cpp_info.defines = ["MYSQL_STATIC", "STATIC_CONCPP"] - - - if is_apple_os(self) or self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.system_libs.extend(["resolv"]) - if self.settings.os in ["Linux", "FreeBSD"]: - self.cpp_info.system_libs.extend(["m", "pthread", "dl"])