Merge pull request #1 from haider8645/feature/qt5

planthaber · web-flow · commit 867f508a1a1d · 2022-05-19T09:57:36.000+02:00
Update root Cmake to use moc from qt5
diff --git 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)
+project(vizkit3d_plugin_tutorial VERSION 0.1 DESCRIPTION "vizkit3d plugin tutorial")
 find_package(Rock)
-rock_init(vizkit3d_plugin_tutorial 0.1)
+rock_init()
 rock_standard_layout()
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+rock_find_qt5(Core)`
	`2`	`+`
`1`	`3`	`rock_vizkit_plugin(vizkit3d_plugin_tutorial-viz`
`2`	`4`	`SphereVisualization.cpp`
`3`	`5`	`DEPS vizkit3d_plugin_tutorial`