Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Qt6 use bundled dependencies and option to disable features. #9254

Closed
wants to merge 8 commits into from
Closed

Qt6 use bundled dependencies and option to disable features. #9254

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b3c5a1c
Qt6: Added option to use the bundled versions of dependencies.
Cyriuz Feb 3, 2022
3d249b3
Qt6: Added option to disable arbitrary qt features.
Cyriuz Feb 3, 2022
8e6d59c
Qt6: Expose WidgetsPrivate target.
Cyriuz Feb 3, 2022
a72f2f0
Qt6: When building bundled dependencies make sure to tell conan about…
Cyriuz Feb 4, 2022
221bc3a
Qt6: Create QSQLiteDriverPlugin even if the bundled sqlite is used
Cyriuz Feb 5, 2022
b3838fb
Qt6: Removed strawberryperl haxx in favor of fixing its package instead
Cyriuz Feb 8, 2022
f899f47
Qt6: Missed removing argument in the previous change.
Cyriuz Feb 8, 2022
3652581
Qt6: Call the non bundled dependencies conan instead of system
Cyriuz Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions recipes/qt/6.x.x/conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,10 @@ def _get_module_tree(self):

return self._submodules_tree

def _with_system_dependency(self, dep):
Cyriuz marked this conversation as resolved.
Show resolved Hide resolved
option = self.options.get_safe(dep, False)
return option and option != "qt"

def export_sources(self):
for patch in self.conan_data.get("patches", {}).get(self.version, []):
self.copy(patch["patch_file"])
Expand Down Expand Up @@ -241,7 +245,7 @@ def _enablemodule(mod):
("with_sqlite3", "sqlite3"),
("with_pcre2", "pcre2")]:
if self.options.get_safe(opt, False) == "qt":
self.provides.append(dep)
self.provides.append(dep)

def validate(self):
# C++ minimum standard required
Expand Down Expand Up @@ -272,7 +276,7 @@ def validate(self):
if self.settings.os != "Windows" and self.options.get_safe("opengl", "no") == "dynamic":
raise ConanInvalidConfiguration("Dynamic OpenGL is supported only on Windows.")

if self.options.get_safe("with_fontconfig", False) and not self.options.get_safe("with_freetype", False) is True:
if self.options.get_safe("with_fontconfig", False) and not self._with_system_dependency("with_freetype", False):
raise ConanInvalidConfiguration("with_fontconfig cannot be enabled if with_freetype is disabled.")

if "MT" in self.settings.get_safe("compiler.runtime", default="") and self.options.shared:
Expand All @@ -286,32 +290,32 @@ def requirements(self):
self.requires("zlib/1.2.11")
if self.options.openssl:
self.requires("openssl/1.1.1m")
if self.options.with_pcre2 is True:
if self._with_system_dependency("with_pcre2"):
self.requires("pcre2/10.37")
if self.options.get_safe("with_vulkan"):
self.requires("vulkan-loader/1.2.182")
if tools.is_apple_os(self.settings.os):
self.requires("moltenvk/1.1.4")
if self.options.with_glib:
self.requires("glib/2.70.1")
if self.options.with_doubleconversion is True and not self.options.multiconfiguration:
if self._with_system_dependency("with_doubleconversion") and not self.options.multiconfiguration:
self.requires("double-conversion/3.1.7")
if self.options.get_safe("with_freetype", False) is True and not self.options.multiconfiguration:
if self._with_system_dependency("with_freetype") and not self.options.multiconfiguration:
self.requires("freetype/2.11.0")
if self.options.get_safe("with_fontconfig", False):
self.requires("fontconfig/2.13.93")
if self.options.get_safe("with_icu", False):
self.requires("icu/70.1")
if self.options.get_safe("with_harfbuzz", False) is True and not self.options.multiconfiguration:
if self._with_system_dependency("with_harfbuzz") and not self.options.multiconfiguration:
self.requires("harfbuzz/3.2.0")
if self.options.get_safe("with_libjpeg", False) and not self.options.multiconfiguration:
if self.options.with_libjpeg == "libjpeg-turbo":
self.requires("libjpeg-turbo/2.1.2")
elif self.options.with_libjpeg == "libjpeg":
self.requires("libjpeg/9d")
if self.options.get_safe("with_libpng", False) is True and not self.options.multiconfiguration:
if self._with_system_dependency("with_libpng") and not self.options.multiconfiguration:
self.requires("libpng/1.6.37")
if self.options.with_sqlite3 is True and not self.options.multiconfiguration:
if self._with_system_dependency("with_sqlite3") and not self.options.multiconfiguration:
self.requires("sqlite3/3.37.2")
self.options["sqlite3"].enable_column_metadata = True
if self.options.get_safe("with_mysql", False):
Expand Down Expand Up @@ -415,9 +419,7 @@ def source(self):

tools.replace_in_file(os.path.join("qt6", "CMakeLists.txt"),
"enable_testing()",
"include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)\n"
"list(REMOVE_ITEM CONAN_INCLUDE_DIRS \"${CONAN_INCLUDE_DIRS_STRAWBERRYPERL}\")\n" # strawberryperl exports includes for jpg, png and many other dependencies that might interfere with the build
"conan_basic_setup(KEEP_RPATHS)\n"
"include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)\nconan_basic_setup(KEEP_RPATHS)\n"
"set(QT_EXTRA_INCLUDEPATHS ${CONAN_INCLUDE_DIRS})\n"
"set(QT_EXTRA_DEFINES ${CONAN_DEFINES})\n"
"set(QT_EXTRA_LIBDIRS ${CONAN_LIB_DIRS})\n"
Expand Down Expand Up @@ -594,8 +596,8 @@ def _configure_cmake(self):
("with_libjpeg", "jpeg", "jpeg"),
("with_libpng", "png", "png"),
("with_sqlite3", "sqlite", "sql_sqlite"),
("with_pcre2", "pcre2", "pcre2"),]:
if self.options.get_safe(opt, False) is not False:
("with_pcre2", "pcre2", "pcre2")]:
if self.options.get_safe(opt, False):
self._cmake.definitions["FEATURE_%s" % conf_arg] = "ON"
if self.options.multiconfiguration or self.options.get_safe(opt, False) == "qt":
self._cmake.definitions["FEATURE_system_%s" % feature] = "OFF"
Expand Down Expand Up @@ -875,9 +877,9 @@ def _create_plugin(pluginname, libname, type, requires):
self.cpp_info.components[componentname].requires = _get_corrected_reqs(requires)

core_reqs = ["zlib::zlib"]
if self.options.with_pcre2 is True:
if self._with_system_dependency("with_pcre2"):
core_reqs.append("pcre2::pcre2")
if self.options.with_doubleconversion is True:
if self._with_system_dependency("with_doubleconversion"):
core_reqs.append("double-conversion::double-conversion")
if self.options.get_safe("with_icu", False):
core_reqs.append("icu::icu")
Expand All @@ -899,9 +901,9 @@ def _create_plugin(pluginname, libname, type, requires):
gui_reqs = []
if self.options.with_dbus:
gui_reqs.append("DBus")
if self.options.with_freetype is True:
if self._with_system_dependency("with_freetype"):
gui_reqs.append("freetype::freetype")
if self.options.with_libpng is True:
if self._with_system_dependency("with_libpng"):
gui_reqs.append("libpng::libpng")
if self.options.get_safe("with_fontconfig", False):
gui_reqs.append("fontconfig::fontconfig")
Expand All @@ -915,7 +917,7 @@ def _create_plugin(pluginname, libname, type, requires):
gui_reqs.append("vulkan-loader::vulkan-loader")
if tools.is_apple_os(self.settings.os):
gui_reqs.append("moltenvk::moltenvk")
if self.options.with_harfbuzz is True:
if self._with_system_dependency("with_harfbuzz"):
gui_reqs.append("harfbuzz::harfbuzz")
if self.options.with_libjpeg == "libjpeg-turbo":
gui_reqs.append("libjpeg-turbo::libjpeg-turbo")
Expand Down Expand Up @@ -950,7 +952,7 @@ def _create_plugin(pluginname, libname, type, requires):
_create_plugin("QXcbIntegrationPlugin", "qxcb", "platforms", ["Core", "Gui", "XcbQpaPrivate"])

if self.options.with_sqlite3:
_create_plugin("QSQLiteDriverPlugin", "qsqlite", "sqldrivers", ["sqlite3::sqlite3"] if self.options.with_sqlite3 is True else [])
_create_plugin("QSQLiteDriverPlugin", "qsqlite", "sqldrivers", ["sqlite3::sqlite3"] if self._with_system_dependency("with_sqlite3") else [])
if self.options.with_pq:
_create_plugin("QPSQLDriverPlugin", "qsqlpsql", "sqldrivers", ["libpq::libpq"])
if self.options.with_odbc:
Expand Down