Now it compiles fine (need to fix a error when we re-try to compile it)

works fine when we build after a make clean
I will fix it after eating

svn path=/trunk/KDE/kdeedu/kalzium/src/widgets/kalzium.widgets; revision=551984

diff --git a/kalzium/widgets/CMakeLists.txt b/kalzium/widgets/CMakeLists.txt
index ce05248eda38ca61fc7aa375920ea583a5889512..684b4eddbe07ce98b069306892aea8cd3c950620 100644 (file)
--- a/kalzium/widgets/CMakeLists.txt
+++ b/kalzium/widgets/CMakeLists.txt
@@ -2,19 +2,19 @@ if(OPENBABEL2_FOUND)
        include_directories( ${OPENBABEL2_INCLUDE_DIR} )
 endif(OPENBABEL2_FOUND)
 
-set(kalziumui_PART_SRCS
-               kalziumglplugin.cpp
+set(kalziumui_PART_SRCS 
                kalziumglwidget.cpp
    )
 
-KDE4_ADD_WIDGET_FILES(${kalziumui_PART_SRCS} kalzium.widgets)
+KDE4_ADD_WIDGET_FILES(kalziumui_PART_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/kalziumui.widgets)
+
+kde4_automoc(${kalziumui_PART_SRCS})
 
 kde4_add_plugin(kalziumuiwidgets ${kalziumui_PART_SRCS})
 
 kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kalziumuiwidgets )
 
-target_link_libraries(kalziumuiwidgets ${OPENBABEL2_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+target_link_libraries(kalziumuiwidgets ${OPENBABEL2_LIBRARIES} ${QT_QTOPENGL_LIBRARY} ${QT_QTDESIGNER_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY})
 
 install_targets(${PLUGIN_INSTALL_DIR}/plugins/designer kalziumuiwidgets)
 
-kde4_automoc(${kalziumui_PART_SRCS})

diff --git a/kalzium/widgets/kalzium.widgets b/kalzium/widgets/kalziumui.widgets
similarity index 62%
rename from kalzium/widgets/kalzium.widgets
rename to kalzium/widgets/kalziumui.widgets
index cf9eb3b2c0f52cfd92986c3382e6a0e6e491afde..bcd0f7669a8de5f427f1f7e07b2c2e782cc20dd3 100644 (file)
--- a/kalzium/widgets/kalzium.widgets
+++ b/kalzium/widgets/kalziumui.widgets
@@ -8,3 +8,10 @@ ToolTip=A OpenGL based molecule viewer
 WhatsThis=A OpenGL based molecule viewer
 Group=Plot (KDE-Edu)
 ConstructorArgs=(parent)
+
+[KalziumGLWidget]
+ToolTip=A OpenGL based molecule viewer
+WhatsThis=A OpenGL based molecule viewer
+Group=Plot (KDE-Edu)
+ConstructorArgs=(parent)
+