Commit 5bab2477 authored by Joseph Mirabel's avatar Joseph Mirabel Committed by Joseph Mirabel
Browse files

[WIP] Fix hppcorbaserverplugin for compatibility with Qt5

parent 256e0e06
...@@ -30,12 +30,17 @@ SET(${PLUGIN_NAME}_FORMS ...@@ -30,12 +30,17 @@ SET(${PLUGIN_NAME}_FORMS
SET(${PLUGIN_NAME}_RESOURCES SET(${PLUGIN_NAME}_RESOURCES
) )
QT4_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS} OPTIONS -I${GEPETTO_VIEWER_CORBA_INCLUDEDIR}) IF(USE_QT4)
QT4_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS}) QT4_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS} OPTIONS -I${GEPETTO_VIEWER_CORBA_INCLUDEDIR})
QT4_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES}) QT4_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
QT4_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
INCLUDE(${QT_USE_FILE})
ELSE(USE_QT4)
QT5_WRAP_CPP(${PLUGIN_NAME}_HEADERS_MOC ${${PLUGIN_NAME}_HEADERS} OPTIONS -I${GEPETTO_VIEWER_CORBA_INCLUDEDIR})
QT5_WRAP_UI(${PLUGIN_NAME}_FORMS_HEADERS ${${PLUGIN_NAME}_FORMS})
QT5_ADD_RESOURCES(${PLUGIN_NAME}_RESOURCES_RCC ${${PLUGIN_NAME}_RESOURCES})
ENDIF(USE_QT4)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
INCLUDE(${QT_USE_FILE})
ADD_DEFINITIONS(${QT_DEFINITIONS}) ADD_DEFINITIONS(${QT_DEFINITIONS})
ADD_DEFINITIONS(-DQT_PLUGIN) ADD_DEFINITIONS(-DQT_PLUGIN)
ADD_DEFINITIONS(-DQT_SHARED) ADD_DEFINITIONS(-DQT_SHARED)
......
...@@ -42,6 +42,8 @@ namespace hpp { ...@@ -42,6 +42,8 @@ namespace hpp {
return QString ("hpp-corbaserver plugin"); return QString ("hpp-corbaserver plugin");
} }
#ifdef USE_QT4
Q_EXPORT_PLUGIN2 (hppcorbaserverplugin, HppCorbaserverPlugin) Q_EXPORT_PLUGIN2 (hppcorbaserverplugin, HppCorbaserverPlugin)
#endif // USE_QT4
} // namespace gui } // namespace gui
} // namespace hpp } // namespace hpp
...@@ -15,6 +15,9 @@ namespace hpp { ...@@ -15,6 +15,9 @@ namespace hpp {
{ {
Q_OBJECT Q_OBJECT
Q_INTERFACES (gepetto::gui::PluginInterface) Q_INTERFACES (gepetto::gui::PluginInterface)
#ifndef USE_QT4
Q_PLUGIN_METADATA (IID "hpp-gui.hppcorbaserverplugin")
#endif // USE_QT4
public: public:
explicit HppCorbaserverPlugin (); explicit HppCorbaserverPlugin ();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment