Allow qt4 and qt5 side-by-side

Author: pierrewillenbrockdfki

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()

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()
 

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)
+}

viz/SphereVisualization.hpp

@@ -39,6 +39,6 @@ namespace vizkit3d
         Data* p;
     };
 
-    VizkitQtPlugin(SphereVisualization)
+    VizkitQtPluginHeaderDecls(SphereVisualization)
 }
 #endif

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}
+