From 5a3a603f602401b040e331850178eff4fe1b3335 Mon Sep 17 00:00:00 2001 From: mlodhi Date: Mon, 25 Apr 2022 13:43:59 +0200 Subject: [PATCH 1/6] Update root Cmake to use moc from qt5 --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ded32d0..0105765 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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.0) +project(vizkit3d_plugin_tutorial VERSION 0.1 DESCRIPTION "vizkit3d plugin tutorial") find_package(Rock) -rock_init(vizkit3d_plugin_tutorial 0.1) +rock_init() +rock_find_qt5(Core) rock_standard_layout() From 6ac7394463785e4ad9503d6a5edbad343f875bb1 Mon Sep 17 00:00:00 2001 From: mlodhi Date: Mon, 25 Apr 2022 14:10:37 +0200 Subject: [PATCH 2/6] Move rock_find_qt5() to the correct CMakeLists --- CMakeLists.txt | 1 - viz/CMakeLists.txt | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0105765..9b6755e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,5 +4,4 @@ cmake_minimum_required(VERSION 3.0) project(vizkit3d_plugin_tutorial VERSION 0.1 DESCRIPTION "vizkit3d plugin tutorial") find_package(Rock) rock_init() -rock_find_qt5(Core) rock_standard_layout() diff --git a/viz/CMakeLists.txt b/viz/CMakeLists.txt index 754c8d9..211b6b3 100644 --- a/viz/CMakeLists.txt +++ b/viz/CMakeLists.txt @@ -1,3 +1,5 @@ +rock_find_qt5(Core) + rock_vizkit_plugin(vizkit3d_plugin_tutorial-viz SphereVisualization.cpp DEPS vizkit3d_plugin_tutorial From 508a9f2704ee73165d6ce6915b28c5fff3d98fe0 Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Fri, 20 May 2022 14:07:58 +0200 Subject: [PATCH 3/6] Moved VizkitQtPlugin to where moc can see it --- viz/SphereVisualization.cpp | 2 -- viz/SphereVisualization.hpp | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/viz/SphereVisualization.cpp b/viz/SphereVisualization.cpp index d431c1b..a69ddd3 100644 --- a/viz/SphereVisualization.cpp +++ b/viz/SphereVisualization.cpp @@ -62,5 +62,3 @@ double SphereVisualization::getTransparency() return transparency; } -//Macro that makes this plugin loadable in ruby, this is optional. -VizkitQtPlugin(SphereVisualization) diff --git a/viz/SphereVisualization.hpp b/viz/SphereVisualization.hpp index 099fce3..09e5c3d 100644 --- a/viz/SphereVisualization.hpp +++ b/viz/SphereVisualization.hpp @@ -38,5 +38,7 @@ namespace vizkit3d struct Data; Data* p; }; + + VizkitQtPlugin(SphereVisualization) } #endif From fcca910c5b3038d95a01b81c9a566d0de392fa63 Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Tue, 18 Jul 2023 13:00:49 +0200 Subject: [PATCH 4/6] Allow qt4 and qt5 side-by-side --- CMakeLists.txt | 1 + viz/CMakeLists.txt | 26 +++++++++++++++++------- viz/SphereVisualization.cpp | 5 +++++ viz/SphereVisualization.hpp | 2 +- viz/vizkit_plugin_tutorial-viz-qt5.pc.in | 12 +++++++++++ 5 files changed, 38 insertions(+), 8 deletions(-) create mode 100644 viz/vizkit_plugin_tutorial-viz-qt5.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 9b6755e..fe6301b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,4 +4,5 @@ cmake_minimum_required(VERSION 3.0) project(vizkit3d_plugin_tutorial VERSION 0.1 DESCRIPTION "vizkit3d plugin tutorial") find_package(Rock) rock_init() +rock_feature(NOCURDIR) rock_standard_layout() diff --git a/viz/CMakeLists.txt b/viz/CMakeLists.txt index 211b6b3..22528bc 100644 --- a/viz/CMakeLists.txt +++ b/viz/CMakeLists.txt @@ -1,9 +1,21 @@ -rock_find_qt5(Core) -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) + +if (ROCK_QT_VERSION_4) + rock_vizkit_plugin(vizkit3d_plugin_tutorial-viz + SphereVisualization.cpp + DEPS vizkit3d_plugin_tutorial + DEPS_PKGCONFIG base-types + MOC SphereVisualization.hpp + HEADERS SphereVisualization.hpp) +endif() +if (ROCK_QT_VERSION_5) + rock_vizkit_plugin_qt5(vizkit3d_plugin_tutorial-viz-qt5 + SphereVisualization.cpp + DEPS vizkit3d_plugin_tutorial + DEPS_PKGCONFIG base-types + MOC5 SphereVisualization.hpp + HEADERS SphereVisualization.hpp) +endif() diff --git a/viz/SphereVisualization.cpp b/viz/SphereVisualization.cpp index a69ddd3..47b8ee9 100644 --- a/viz/SphereVisualization.cpp +++ b/viz/SphereVisualization.cpp @@ -3,6 +3,7 @@ using namespace vizkit3d; + struct SphereVisualization::Data { // Copy of the value given to updateDataIntern. // @@ -62,3 +63,7 @@ double SphereVisualization::getTransparency() return transparency; } +namespace vizkit3d +{ +VizkitQtPluginImpl(SphereVisualization) +} diff --git a/viz/SphereVisualization.hpp b/viz/SphereVisualization.hpp index 09e5c3d..852b9d2 100644 --- a/viz/SphereVisualization.hpp +++ b/viz/SphereVisualization.hpp @@ -39,6 +39,6 @@ namespace vizkit3d Data* p; }; - VizkitQtPlugin(SphereVisualization) + VizkitQtPluginHeaderDecls(SphereVisualization) } #endif diff --git a/viz/vizkit_plugin_tutorial-viz-qt5.pc.in b/viz/vizkit_plugin_tutorial-viz-qt5.pc.in new file mode 100644 index 0000000..660e86d --- /dev/null +++ b/viz/vizkit_plugin_tutorial-viz-qt5.pc.in @@ -0,0 +1,12 @@ +prefix=@CMAKE_INSTALL_PREFIX@ +exec_prefix=@CMAKE_INSTALL_PREFIX@ +libdir=${prefix}/lib +includedir=${prefix}/include + +Name: vizkit3d_plugin_tutorial-viz-qt5 +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-qt5 +Cflags: -I${includedir} + From 2ccd17b9e3dfa34716af75a057af6dac3d11d3fb Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Wed, 19 Jul 2023 11:44:58 +0200 Subject: [PATCH 5/6] Fix names of .pc.in files, use @TARGET_NAME@ instead of hard coding --- src/{dummyproject.pc.in => vizkit3d_plugin_tutorial.pc.in} | 0 ...orial-viz.pc.in => vizkit3d_plugin_tutorial-viz-qt5.pc.in} | 4 ++-- ...orial-viz-qt5.pc.in => vizkit3d_plugin_tutorial-viz.pc.in} | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/{dummyproject.pc.in => vizkit3d_plugin_tutorial.pc.in} (100%) rename viz/{vizkit_plugin_tutorial-viz.pc.in => vizkit3d_plugin_tutorial-viz-qt5.pc.in} (77%) rename viz/{vizkit_plugin_tutorial-viz-qt5.pc.in => vizkit3d_plugin_tutorial-viz.pc.in} (75%) diff --git a/src/dummyproject.pc.in b/src/vizkit3d_plugin_tutorial.pc.in similarity index 100% rename from src/dummyproject.pc.in rename to src/vizkit3d_plugin_tutorial.pc.in diff --git a/viz/vizkit_plugin_tutorial-viz.pc.in b/viz/vizkit3d_plugin_tutorial-viz-qt5.pc.in similarity index 77% rename from viz/vizkit_plugin_tutorial-viz.pc.in rename to viz/vizkit3d_plugin_tutorial-viz-qt5.pc.in index 7cccbef..d8d65ae 100644 --- a/viz/vizkit_plugin_tutorial-viz.pc.in +++ b/viz/vizkit3d_plugin_tutorial-viz-qt5.pc.in @@ -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} diff --git a/viz/vizkit_plugin_tutorial-viz-qt5.pc.in b/viz/vizkit3d_plugin_tutorial-viz.pc.in similarity index 75% rename from viz/vizkit_plugin_tutorial-viz-qt5.pc.in rename to viz/vizkit3d_plugin_tutorial-viz.pc.in index 660e86d..d8d65ae 100644 --- a/viz/vizkit_plugin_tutorial-viz-qt5.pc.in +++ b/viz/vizkit3d_plugin_tutorial-viz.pc.in @@ -3,10 +3,10 @@ exec_prefix=@CMAKE_INSTALL_PREFIX@ libdir=${prefix}/lib includedir=${prefix}/include -Name: vizkit3d_plugin_tutorial-viz-qt5 +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-qt5 +Libs: -L${libdir} -l@TARGET_NAME@ Cflags: -I${includedir} From 893830fb62744853b4dab02459e02e7cd630be9d Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Thu, 25 Sep 2025 13:27:38 +0200 Subject: [PATCH 6/6] Use RockQt macros --- CMakeLists.txt | 2 +- viz/CMakeLists.txt | 25 +++++++++---------------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe6301b..cd0a6de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # 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 3.0) +cmake_minimum_required(VERSION 3.1) project(vizkit3d_plugin_tutorial VERSION 0.1 DESCRIPTION "vizkit3d plugin tutorial") find_package(Rock) rock_init() diff --git a/viz/CMakeLists.txt b/viz/CMakeLists.txt index 22528bc..065b66a 100644 --- a/viz/CMakeLists.txt +++ b/viz/CMakeLists.txt @@ -2,20 +2,13 @@ rock_find_qt5(OPTIONAL) rock_find_qt4(OPTIONAL) -if (ROCK_QT_VERSION_4) - rock_vizkit_plugin(vizkit3d_plugin_tutorial-viz - SphereVisualization.cpp - DEPS vizkit3d_plugin_tutorial - DEPS_PKGCONFIG base-types - MOC SphereVisualization.hpp - HEADERS SphereVisualization.hpp) -endif() -if (ROCK_QT_VERSION_5) - rock_vizkit_plugin_qt5(vizkit3d_plugin_tutorial-viz-qt5 - SphereVisualization.cpp - DEPS vizkit3d_plugin_tutorial - DEPS_PKGCONFIG base-types - MOC5 SphereVisualization.hpp - HEADERS SphereVisualization.hpp) -endif() +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)