Skip to content

Feature/qt4 qt5 #3

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

Feature/qt4 qt5 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5a3a603
Update root Cmake to use moc from qt5
haider8645 Apr 25, 2022
6ac7394
Move rock_find_qt5() to the correct CMakeLists
haider8645 Apr 25, 2022
867f508
Merge pull request #1 from haider8645/feature/qt5
planthaber May 19, 2022
508a9f2
Moved VizkitQtPlugin to where moc can see it
pierrewillenbrockdfki May 20, 2022
fc044da
Merge pull request #2 from pierrewillenbrockdfki/feature/qt5
planthaber May 20, 2022
fcca910
Allow qt4 and qt5 side-by-side
pierrewillenbrockdfki Jul 18, 2023
2ccd17b
Fix names of .pc.in files, use @TARGET_NAME@ instead of hard coding
pierrewillenbrockdfki Jul 19, 2023
893830f
Use RockQt macros
pierrewillenbrockdfki Sep 25, 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
6 changes: 4 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
# CMakeLists.txt has to be located in the project folder and cmake has to be
# executed from 'project/build' with 'cmake ../'.
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 3.1)
project(vizkit3d_plugin_tutorial VERSION 0.1 DESCRIPTION "vizkit3d plugin tutorial")
find_package(Rock)
rock_init(vizkit3d_plugin_tutorial 0.1)
rock_init()
rock_feature(NOCURDIR)
rock_standard_layout()
0 src/dummyproject.pc.in → src/vizkit3d_plugin_tutorial.pc.in
View file
Open in desktop
File renamed without changes.
19 changes: 13 additions & 6 deletions viz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
rock_vizkit_plugin(vizkit3d_plugin_tutorial-viz
SphereVisualization.cpp
DEPS vizkit3d_plugin_tutorial
DEPS_PKGCONFIG base-types
MOC SphereVisualization.hpp
HEADERS SphereVisualization.hpp)

rock_find_qt5(OPTIONAL)
rock_find_qt4(OPTIONAL)

include(RockQt)

rock_qt_vizkit_plugin(
TARGETPREFIX vizkit3d_plugin_tutorial-viz
QT4_SUFFIX ""
SOURCES SphereVisualization.cpp
MOC SphereVisualization.hpp
HEADERS SphereVisualization.hpp
DEPS vizkit3d_plugin_tutorial
DEPS_PKGCONFIG base-types)
7 changes: 5 additions & 2 deletions viz/SphereVisualization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

using namespace vizkit3d;


struct SphereVisualization::Data {
// Copy of the value given to updateDataIntern.
//
Expand Down Expand Up @@ -62,5 +63,7 @@ double SphereVisualization::getTransparency()
return transparency;
}

//Macro that makes this plugin loadable in ruby, this is optional.
VizkitQtPlugin(SphereVisualization)
namespace vizkit3d
{
VizkitQtPluginImpl(SphereVisualization)
}
2 changes: 2 additions & 0 deletions viz/SphereVisualization.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@ namespace vizkit3d
struct Data;
Data* p;
};

VizkitQtPluginHeaderDecls(SphereVisualization)
}
#endif
4 changes: 2 additions & 2 deletions viz/vizkit_plugin_tutorial-viz.pc.in → viz/vizkit3d_plugin_tutorial-viz-qt5.pc.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ exec_prefix=@CMAKE_INSTALL_PREFIX@
libdir=${prefix}/lib
includedir=${prefix}/include

Name: vizkit3d_plugin_tutorial-viz
Name: @TARGET_NAME@
Description: vizKit plugin for the vizkit3d_plugin_tutorial library
Requires: vizkit3d_plugin_tutorial @PKGCONFIG_DEPS@
Version: @PROJECT_VERSION@
Libs: -L${libdir} -lvizkit3d_plugin_tutorial-viz
Libs: -L${libdir} -l@TARGET_NAME@
Cflags: -I${includedir}

12 changes: 12 additions & 0 deletions viz/vizkit3d_plugin_tutorial-viz.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: @TARGET_NAME@
Description: vizKit plugin for the vizkit3d_plugin_tutorial library
Requires: vizkit3d_plugin_tutorial @PKGCONFIG_DEPS@
Version: @PROJECT_VERSION@
Libs: -L${libdir} -l@TARGET_NAME@
Cflags: -I${includedir}