[Kst] branches/work/kst/portto4/kst/src

[Adam Treat]

SVN commit 642594 by treat:

* Another missed export and a little cmake trickery
and kst successfully compiles and links.  We have
an actual executable :)


 M  +5 -3      kst/CMakeLists.txt  
 M  +3 -1      libkstapp/dialoglauncher-gui.h  
 M  +3 -1      libkstapp/kstdatacollection-gui.h  
 M  +3 -3      widgets/CMakeLists.txt  


--- branches/work/kst/portto4/kst/src/kst/CMakeLists.txt #642593:642594
@@ -10,13 +10,15 @@
 
 kde4_automoc(${kst_SRCS})
 
-kde4_add_executable(kst ${kst_SRCS})
+kde4_add_executable(kstexe ${kst_SRCS})
 
-target_link_libraries(kst  ${KDE4_KDECORE_LIBS} kstapp )
+target_link_libraries(kstexe ${KDE4_KDECORE_LIBS} kstapp )
 
-install(TARGETS kst DESTINATION ${BIN_INSTALL_DIR})
+set_target_properties(kstexe PROPERTIES OUTPUT_NAME kst)
 
+install(TARGETS kstexe DESTINATION ${BIN_INSTALL_DIR})
 
+
 ########### install files ###############
 
 install( FILES  kst.desktop DESTINATION ${XDG_APPS_DIR} )
--- branches/work/kst/portto4/kst/src/libkstapp/dialoglauncher-gui.h #642593:642594
@@ -19,6 +19,8 @@
 #define DIALOGLAUNCHERGUI_H
 #include "dialoglauncher.h"
 
+#include "kst_export.h"
+
 class KstGuiDialogs : public KstDialogs {
   public:
     KstGuiDialogs();
@@ -45,7 +47,7 @@
 
     void newVectorDialog(QWidget *parent, const char *createdSlot = 0L, const char *selectedSlot = 0L, const char *updateSlot = 0L);
     void showVectorDialog(const QString& name = QString::null, bool edit = false);
-};
+} KST_EXPORT;
 
 #endif
 
--- branches/work/kst/portto4/kst/src/libkstapp/kstdatacollection-gui.h #642593:642594
@@ -20,6 +20,8 @@
 
 #include "kstdatacollection.h"
 
+#include "kst_export.h"
+
 class KstGuiData : public KstData {
   public:
     KstGuiData();
@@ -43,7 +45,7 @@
     void newWindow(QWidget *dialogParent = 0L);
     QStringList windowList();
     QString currentWindow();
-};
+} KST_EXPORT;
 
 #endif
 // vim: ts=2 sw=2 et
--- branches/work/kst/portto4/kst/src/widgets/CMakeLists.txt #642593:642594
@@ -60,11 +60,11 @@
 # 
 # kde4_automoc(${kstwidgets_PART_SRCS})
 # 
-# kde4_add_plugin(kstwidgets ${kstwidgets_PART_SRCS})
+# kde4_add_plugin(kstwidgetsplugin ${kstwidgets_PART_SRCS})
 # 
-# target_link_libraries(kstwidgets ${KDE4_KDECORE_LIBS})
+# target_link_libraries(kstwidgetsplugin ${KDE4_KDECORE_LIBS})
 # 
-# install(TARGETS kstwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer)
+# install(TARGETS kstwidgetsplugin DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer)
 
 
 ########### install files ###############