From e353695d9c4a152545fdc9c01bd21e7e617103cf Mon Sep 17 00:00:00 2001 From: Eric Lemanissier Date: Fri, 18 Jun 2021 08:03:56 +0200 Subject: [PATCH 1/3] qt: raise conan libs priority vs system libs --- recipes/qt/5.x.x/conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index e378b6fbb1439..4e0a0bcc5a084 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -567,6 +567,8 @@ def build(self): for package in self.deps_cpp_info.deps: args += ["-I \"%s\"" % s for s in self.deps_cpp_info[package].include_paths] args += ["-D %s" % s for s in self.deps_cpp_info[package].defines] + lib_arg = "/LIBPATH:" if self.settings.compiler == "Visual Studio" else "-L" + args.append("QMAKE_LFLAGS=\"%s\"" % " ".join("%s%s" % (lib_arg, l) for package in self.deps_cpp_info.deps for l in self.deps_cpp_info[package].lib_paths)) if "libmysqlclient" in self.deps_cpp_info.deps: args.append("-mysql_config \"%s\"" % os.path.join(self.deps_cpp_info["libmysqlclient"].rootpath, "bin", "mysql_config")) @@ -641,8 +643,6 @@ def _getenvpath(var): if self.settings.os == "Windows": build_env["PATH"] = [os.path.join(self.source_folder, "qt5", "gnuwin32", "bin")] - build_env["LIB" if self.settings.compiler == "Visual Studio" else "LIBRARY_PATH"] = \ - [l for package in self.deps_cpp_info.deps for l in self.deps_cpp_info[package].lib_paths] with tools.environment_append(build_env): if tools.os_info.is_macos: From f8ef48a5f074cee64e922a44de9df45a643528f8 Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Tue, 22 Jun 2021 12:25:17 +0200 Subject: [PATCH 2/3] Update conanfile.py --- recipes/qt/5.x.x/conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/qt/5.x.x/conanfile.py b/recipes/qt/5.x.x/conanfile.py index 4e0a0bcc5a084..536bf715b3546 100644 --- a/recipes/qt/5.x.x/conanfile.py +++ b/recipes/qt/5.x.x/conanfile.py @@ -568,7 +568,7 @@ def build(self): args += ["-I \"%s\"" % s for s in self.deps_cpp_info[package].include_paths] args += ["-D %s" % s for s in self.deps_cpp_info[package].defines] lib_arg = "/LIBPATH:" if self.settings.compiler == "Visual Studio" else "-L" - args.append("QMAKE_LFLAGS=\"%s\"" % " ".join("%s%s" % (lib_arg, l) for package in self.deps_cpp_info.deps for l in self.deps_cpp_info[package].lib_paths)) + args.append("QMAKE_LFLAGS+=\"%s\"" % " ".join("%s%s" % (lib_arg, l) for package in self.deps_cpp_info.deps for l in self.deps_cpp_info[package].lib_paths)) if "libmysqlclient" in self.deps_cpp_info.deps: args.append("-mysql_config \"%s\"" % os.path.join(self.deps_cpp_info["libmysqlclient"].rootpath, "bin", "mysql_config")) From a0c3c3fb3e628d4a925f127dce83749557dc633f Mon Sep 17 00:00:00 2001 From: ericLemanissier Date: Thu, 24 Jun 2021 15:57:27 +0200 Subject: [PATCH 3/3] fix test recipe qmake already links to qt libraries --- recipes/qt/5.x.x/test_package/test_package.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes/qt/5.x.x/test_package/test_package.pro b/recipes/qt/5.x.x/test_package/test_package.pro index 1024feaf820d0..d2b56ea977ef1 100644 --- a/recipes/qt/5.x.x/test_package/test_package.pro +++ b/recipes/qt/5.x.x/test_package/test_package.pro @@ -10,3 +10,4 @@ CONFIG += console CONFIG += conan_basic_setup include($$OUT_PWD/../conanbuildinfo.pri) +LIBS -= $$CONAN_LIBS_QT