From 0d6be5628c4b86be742a0de4a134adf08c98c78a Mon Sep 17 00:00:00 2001 From: mlodhi Date: Mon, 25 Apr 2022 14:08:05 +0200 Subject: [PATCH 1/4] Update Cmake syntax and to qt5 --- CMakeLists.txt | 5 +++-- viz/CMakeLists.txt | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5162d30..00ae9dd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,7 @@ # 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) find_package(Rock) -rock_init(rock_tutorial 0.1) +project(RockTutorial VERSION 0.1 DESCRIPTION "Rock Tutorial") +rock_init() rock_standard_layout() diff --git a/viz/CMakeLists.txt b/viz/CMakeLists.txt index 50cd31e..3c3cb85 100644 --- a/viz/CMakeLists.txt +++ b/viz/CMakeLists.txt @@ -1,3 +1,4 @@ +rock_find_qt5(Core) rock_vizkit_plugin(rock_tutorial-viz RockVisualization.cpp From 4361a0db1490d3b717bbd2eae65b666644950a62 Mon Sep 17 00:00:00 2001 From: mlodhi Date: Mon, 25 Apr 2022 14:26:12 +0200 Subject: [PATCH 2/4] Correct project name --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 00ae9dd..999e79f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,6 @@ # executed from 'project/build' with 'cmake ../'. cmake_minimum_required(VERSION 3.0) find_package(Rock) -project(RockTutorial VERSION 0.1 DESCRIPTION "Rock Tutorial") +project(rock_tutorial VERSION 0.1 DESCRIPTION "Rock Tutorial") rock_init() rock_standard_layout() From 142f168333053d3214ab3fb969d1c70fb331f639 Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Fri, 20 May 2022 14:12:49 +0200 Subject: [PATCH 3/4] Moved VizkitQtPlugin to where moc can see it --- viz/RockVisualization.cpp | 3 --- viz/RockVisualization.hpp | 1 + 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/viz/RockVisualization.cpp b/viz/RockVisualization.cpp index 269b156..5f219b2 100644 --- a/viz/RockVisualization.cpp +++ b/viz/RockVisualization.cpp @@ -104,7 +104,4 @@ void RockVisualization::updateMainNode( osg::Node* node ) rockModelPos->setAttitude(orientation); } -//Macro that makes this plugin loadable in ruby, this is optional. -VizkitQtPlugin(RockVisualization) - } diff --git a/viz/RockVisualization.hpp b/viz/RockVisualization.hpp index d8551ae..e889b68 100644 --- a/viz/RockVisualization.hpp +++ b/viz/RockVisualization.hpp @@ -39,5 +39,6 @@ namespace vizkit3d Data* p; }; +VizkitQtPlugin(RockVisualization) } #endif // ROCKVISUALIZATION_H From 5cd3544f789282c8749ce8f05cc05c3134d3ecab Mon Sep 17 00:00:00 2001 From: Pierre Willenbrock Date: Wed, 19 Jul 2023 11:33:39 +0200 Subject: [PATCH 4/4] Allow qt4 and qt5 versions side-by-side --- CMakeLists.txt | 5 +++-- viz/CMakeLists.txt | 12 +++++++++--- viz/RockVisualization.cpp | 1 + viz/RockVisualization.hpp | 2 +- viz/rock_tutorial-viz-qt5.pc.in | 12 ++++++++++++ 5 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 viz/rock_tutorial-viz-qt5.pc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 999e79f..dba31e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +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 3.0) -find_package(Rock) +cmake_minimum_required(VERSION 3.1) project(rock_tutorial VERSION 0.1 DESCRIPTION "Rock Tutorial") +find_package(Rock) rock_init() +rock_feature(NOCURDIR) rock_standard_layout() diff --git a/viz/CMakeLists.txt b/viz/CMakeLists.txt index 3c3cb85..d740fba 100644 --- a/viz/CMakeLists.txt +++ b/viz/CMakeLists.txt @@ -1,7 +1,13 @@ -rock_find_qt5(Core) -rock_vizkit_plugin(rock_tutorial-viz - RockVisualization.cpp +rock_find_qt5(OPTIONAL) +rock_find_qt4(OPTIONAL) + +include(RockQt) + +rock_qt_vizkit_plugin( + TARGETPREFIX rock_tutorial-viz + QT4_SUFFIX "" + SOURCES RockVisualization.cpp MOC RockVisualization.hpp DEPS_PKGCONFIG base-types HEADERS RockVisualization.hpp) diff --git a/viz/RockVisualization.cpp b/viz/RockVisualization.cpp index 5f219b2..7248874 100644 --- a/viz/RockVisualization.cpp +++ b/viz/RockVisualization.cpp @@ -104,4 +104,5 @@ void RockVisualization::updateMainNode( osg::Node* node ) rockModelPos->setAttitude(orientation); } +VizkitQtPluginImpl(RockVisualization) } diff --git a/viz/RockVisualization.hpp b/viz/RockVisualization.hpp index e889b68..0b87b9c 100644 --- a/viz/RockVisualization.hpp +++ b/viz/RockVisualization.hpp @@ -39,6 +39,6 @@ namespace vizkit3d Data* p; }; -VizkitQtPlugin(RockVisualization) +VizkitQtPluginHeaderDecls(RockVisualization) } #endif // ROCKVISUALIZATION_H diff --git a/viz/rock_tutorial-viz-qt5.pc.in b/viz/rock_tutorial-viz-qt5.pc.in new file mode 100644 index 0000000..6b414cd --- /dev/null +++ b/viz/rock_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: @TARGET_NAME@ +Description: @PROJECT_DESCRIPTION@ +Version: @PROJECT_VERSION@ +Depends: @DEPS_PKGCONFIG@ +Libs: -L${libdir} -l@TARGET_NAME@ +Cflags: -I${includedir} +