Skip to content

Add USE_QT5 for qt5 enabled packages #38

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

Open
pierrewillenbrockdfki wants to merge 2 commits into
base: feature/qt5
Choose a base branch
from
Open

Add USE_QT5 for qt5 enabled packages #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2927623
Add USE_QT5 for qt5 enabled packages
pierrewillenbrockdfki Jun 16, 2022
6d7f39c
set USE_QT5 for external/osgQt
pierrewillenbrockdfki Jun 17, 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
86 changes: 72 additions & 14 deletions libs.autobuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -38,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")
Expand All @@ -47,7 +59,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")
Expand All @@ -60,11 +76,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")
Expand All @@ -74,16 +109,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|
Expand Down
6 changes: 5 additions & 1 deletion orogen.autobuild
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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