Skip to content

Build qt5 visualization alongside qt4 visualization #16

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: master
Choose a base branch
from
Open

Build qt5 visualization alongside qt4 visualization #16

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
fe7cbf1
Allow qt4 and qt5 side-by-side
pierrewillenbrockdfki Aug 9, 2023
a1839b4
Use RockQt to deduplicate visualization library declaration
pierrewillenbrockdfki Aug 27, 2025
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ set(ROCK_TEST_ENABLED ON)
SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x" )

rock_init(smurf 0.1)
rock_feature(NOCURDIR)
rock_standard_layout()
41 changes: 28 additions & 13 deletions viz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,33 @@
pkg_check_modules(OSGVIZ osgViz)

if(OSGVIZ)
rock_vizkit_plugin(smurf-collidable-viz
SmurfCollidableViz.cpp
DEPS smurf
DEPS_PKGCONFIG osgViz
MOC SmurfCollidableViz.hpp
HEADERS SmurfCollidableViz.hpp)
rock_vizkit_plugin(smurf-visual-viz
SmurfVisualViz.cpp
DEPS smurf
DEPS_PKGCONFIG osgViz
MOC SmurfVisualViz.hpp
HEADERS SmurfVisualViz.hpp)
if(OSGVIZ_FOUND)
rock_find_qt4(OPTIONAL)
rock_find_qt5(OPTIONAL Widgets Core Gui)

include(RockQt)

rock_qt_vizkit_plugin(
TARGETPREFIX smurf_collidable-viz
QT4_SUFFIX ""
MISSINGQTDEPS_NOBUILD
SOURCES SmurfCollidableViz.cpp
DEPS smurf
DEPS_PKGCONFIG osgViz
MOC SmurfCollidableViz.hpp
HEADERS SmurfCollidableViz.hpp
LIBS_QT4 Qt4::QtCore Qt4::QtGui
LIBS_QT5 Qt5::Core Qt5::Gui)
rock_qt_vizkit_plugin(
TARGETPREFIX smurf_visual-viz
QT4_SUFFIX ""
MISSINGQTDEPS_NOBUILD
SOURCES SmurfVisualViz.cpp
DEPS smurf
DEPS_PKGCONFIG osgViz
MOC SmurfVisualViz.hpp
HEADERS SmurfVisualViz.hpp
LIBS_QT4 Qt4::QtCore Qt4::QtGui
LIBS_QT5 Qt5::Core Qt5::Gui Qt5::Widgets)
else()
message(STATUS "Could not find osgViz: vizkit plugins cannot be generated")
endif()
5 changes: 4 additions & 1 deletion viz/SmurfCollidableViz.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,7 @@ void SmurfCollidableViz::updateDataIntern(smurf::Collidable const& value)

}

VizkitQtPlugin(SmurfCollidableViz)
namespace vizkit3d
{
VizkitQtPluginImpl(SmurfCollidableViz)
}
2 changes: 2 additions & 0 deletions viz/SmurfCollidableViz.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ namespace vizkit3d
struct Data;
Data* p;
};

VizkitQtPluginHeaderDecls(SmurfCollidableViz)
}
5 changes: 4 additions & 1 deletion viz/SmurfVisualViz.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,7 @@ void SmurfVisualViz::updateDataIntern(smurf::Visual const& value)

}

VizkitQtPlugin(SmurfVisualViz)
namespace vizkit3d
{
VizkitQtPluginImpl(SmurfVisualViz)
}
2 changes: 2 additions & 0 deletions viz/SmurfVisualViz.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,6 @@ namespace vizkit3d
struct Data;
Data* p;
};

VizkitQtPluginHeaderDecls(SmurfVisualViz)
}
12 changes: 12 additions & 0 deletions viz/smurf_collidable-viz-qt5.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=${prefix}/lib
includedir=${prefix}/include

Name: smurf_collidable-viz-qt5
Description: vizKit plugin for smurf collidables
Requires: smurf @PKGCONFIG_DEPS@
Version: @PROJECT_VERSION@
Libs: -L${libdir} -lsmurf_collidable-viz-qt5
Cflags: -I${includedir}

12 changes: 12 additions & 0 deletions viz/smurf_visual-viz-qt5.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=${prefix}/lib
includedir=${prefix}/include

Name: smurf_visual-viz-qt5
Description: vizKit plugin for smurf visuals
Requires: smurf @PKGCONFIG_DEPS@
Version: @PROJECT_VERSION@
Libs: -L${libdir} -lsmurf_visual-viz-qt5
Cflags: -I${includedir}