From 29276236338261e99c889da780418661b4f1c85b Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Thu, 16 Jun 2022 10:51:25 +0200 Subject: [PATCH 1/2] Add USE_QT5 for qt5 enabled packages --- libs.autobuild | 80 ++++++++++++++++++++++++++++++++++++++++-------- orogen.autobuild | 6 +++- 2 files changed, 72 insertions(+), 14 deletions(-) diff --git a/libs.autobuild b/libs.autobuild index 9739802..7596692 100644 --- a/libs.autobuild +++ b/libs.autobuild @@ -20,8 +20,16 @@ def mars_package(srcDir,type = :cmake_package) end -mars_package("simulation/mars/common/gui/config_map_gui") -mars_package("simulation/mars/common/gui/gui_app") +mars_package("simulation/mars/common/gui/config_map_gui") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" +end +mars_package("simulation/mars/common/gui/gui_app") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" +end mars_package("simulation/mars/entity_generation/primitives") mars_package("simulation/mars/plugins/entity_view") mars_package("simulation/mars/plugins/SkyDomePlugin") @@ -47,7 +55,11 @@ end in_flavor 'master','stable' do mars_package("simulation/mars/entity_generation/entity_factory") mars_package("simulation/mars/entity_generation/smurf") - mars_package("simulation/mars/smurf_loader") + mars_package("simulation/mars/smurf_loader") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end mars_package("simulation/mars/plugins/Text3D") mars_package("simulation/mars/common/graphics/osg_text") mars_package("simulation/mars/common/graphics/osg_text_factory") @@ -60,11 +72,30 @@ in_flavor 'master','stable' do metapackage 'simulation/configmaps', 'tools/configmaps' mars_package("simulation/mars/common/cfg_manager") - mars_package("simulation/mars/common/gui/main_gui") - mars_package("simulation/mars/common/data_broker") - mars_package("simulation/mars/common/gui/cfg_manager_gui") - mars_package("simulation/mars/common/gui/lib_manager_gui") - mars_package("simulation/mars/common/gui/log_console") + mars_package("simulation/mars/common/gui/main_gui") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end + mars_package("simulation/mars/common/data_broker") do |pkg| + pkg.depends_on "qt5" + pkg.env_set "USE_QT5", "1" + end + mars_package("simulation/mars/common/gui/cfg_manager_gui") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end + mars_package("simulation/mars/common/gui/lib_manager_gui") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end + mars_package("simulation/mars/common/gui/log_console") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end mars_package("simulation/mars/common/gui/data_broker_gui") mars_package("simulation/mars/common/gui/data_broker_plotter") mars_package("simulation/mars/common/utils") @@ -74,16 +105,39 @@ in_flavor 'master','stable' do #to enable the autostart of mars pkg.define "DEFAULT_CONFIG_DIR", File.join(Autobuild.prefix,"configuration","mars_default") end - mars_package("simulation/mars/gui") + mars_package("simulation/mars/gui") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end mars_package("simulation/mars/graphics") mars_package("simulation/mars/app") do |pkg| pkg.define "DEFAULT_CONFIG_DIR", File.join(Autobuild.prefix,"configuration","mars_default") + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end + mars_package("simulation/mars/viz") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end + mars_package("simulation/mars/scene_loader") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end + mars_package("simulation/mars/plugins/connexion_plugin") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" end - mars_package("simulation/mars/viz") - mars_package("simulation/mars/scene_loader") - mars_package("simulation/mars/plugins/connexion_plugin") mars_package("simulation/mars/plugins/VirtualJoystickPlugin") - mars_package("simulation/mars/plugins/constraint_plugin") + mars_package("simulation/mars/plugins/constraint_plugin") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end mars_package("simulation/mars/plugins/connectors") mars_package("simulation/mars/doc",:import_package) do |pkg| diff --git a/orogen.autobuild b/orogen.autobuild index fb8bd44..07a2cfc 100644 --- a/orogen.autobuild +++ b/orogen.autobuild @@ -5,6 +5,10 @@ in_flavor 'master' do end in_flavor 'master', 'stable' do - orogen_package 'simulation/orogen/mars' + orogen_package 'simulation/orogen/mars' do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" + end orogen_package 'simulation/orogen/mars_addons' end From 6d7f39cd0feed417e98d17af0df971d276cf34c4 Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Fri, 17 Jun 2022 10:54:39 +0200 Subject: [PATCH 2/2] set USE_QT5 for external/osgQt --- libs.autobuild | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs.autobuild b/libs.autobuild index 7596692..a7140be 100644 --- a/libs.autobuild +++ b/libs.autobuild @@ -46,7 +46,11 @@ mars_package("simulation/mars/plugins/PythonMars") do |pkg| end mars_package("simulation/mars/common/gui/data_broker_plotter2") cmake_package("simulation/mars_extensions/data_broker_graph_view") -cmake_package("external/osgQt") +cmake_package("external/osgQt") do |pkg| + pkg.depends_on "qt5" + pkg.define "USE_QT5", "1" + pkg.env_set "USE_QT5", "1" +end in_flavor 'stable' do mars_package("simulation/mars/scripts/cmake")