SVN commit 982824 by rempt:

Make kpresenter compile and link

 M  +7 -9      CMakeLists.txt  
 M  +1 -1      part/CMakeLists.txt  
 M  +1 -1      part/tools/animationtool/CMakeLists.txt  
 M  +1 -1      plugins/eventactions/CMakeLists.txt  
 M  +2 -2      plugins/pageeffects/barwipe/CMakeLists.txt  
 M  +2 -2      plugins/pageeffects/clockwipe/CMakeLists.txt  
 M  +2 -2      plugins/pageeffects/edgewipe/CMakeLists.txt  
 M  +2 -2      plugins/pageeffects/example/CMakeLists.txt  
 M  +2 -2      plugins/pageeffects/iriswipe/CMakeLists.txt  
 M  +2 -2      plugins/pageeffects/matrixwipe/CMakeLists.txt  
 M  +2 -2      plugins/pageeffects/slidewipe/CMakeLists.txt  
 M  +1 -1      plugins/shapeanimations/example/CMakeLists.txt  


--- trunk/koffice/kpresenter/CMakeLists.txt #982823:982824
@@ -10,12 +10,10 @@
 
 #configure_file(config-kpresenter.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kpresenter.h )
 #
-#include_directories(
-#		${KOTEXT_INCLUDES}
-#		${CMAKE_SOURCE_DIR}/libs/kformula
-#		${KOGUIUTILS_INCLUDES}
-#		${KOPAINTER_INCLUDES})
-#
+include_directories(
+		${KOTEXT_INCLUDES}
+        ${KOMAIN_INCLUDES}
+)
 #include_directories( ${X11_dpms_INCLUDE_PATH} )
 #
 #add_subdirectory( autoforms )
@@ -141,7 +139,7 @@
 #
 #kde4_add_library(kpresenterprivate SHARED ${kpresenterprivate_LIB_SRCS})
 #
-#target_link_libraries(kpresenterprivate  ${KDE4_KDE3SUPPORT_LIBS} koguiutils kotext kopainter )
+#target_link_libraries(kpresenterprivate  ${KDE4_KDE3SUPPORT_LIBS}  kotext kopainter )
 #
 #set_target_properties(kpresenterprivate PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )
 #install(TARGETS kpresenterprivate  ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -156,7 +154,7 @@
 #
 #
 #
-#target_link_libraries(kpresenterpart  ${KDE4_KDE3SUPPORT_LIBS} kpresenterprivate komain koguiutils)
+#target_link_libraries(kpresenterpart  ${KDE4_KDE3SUPPORT_LIBS} kpresenterprivate komain )
 #
 #install(TARGETS kpresenterpart  DESTINATION ${PLUGIN_INSTALL_DIR})
 #
@@ -168,7 +166,7 @@
 ##
 #kde4_add_kdeinit_executable( kpresenter ${kpresenter_KDEINIT_SRCS})
 #
-#target_link_libraries(kdeinit_kpresenter  ${KDE4_KDE3SUPPORT_LIBS} komain koguiutils )
+#target_link_libraries(kdeinit_kpresenter  ${KDE4_KDE3SUPPORT_LIBS} komain  )
 #
 #install(TARGETS kdeinit_kpresenter  ${INSTALL_TARGETS_DEFAULT_ARGS})
 #
--- trunk/koffice/kpresenter/part/CMakeLists.txt #982823:982824
@@ -1,6 +1,6 @@
 project(kpresenter)
 
-include_directories(${KOGUIUTILS_INCLUDES} ${KOTEXT_INCLUDES} ${KOPAGEAPP_INCLUDES} ${Boost_INCLUDE_DIR})
+include_directories( ${KOMAIN_INCLUDES} ${KOPAGEAPP_INCLUDES} ${Boost_INCLUDE_DIR})
 
 if(KDE4_BUILD_TESTS)
     # only with this definition will the KPRESENTER_TEST_EXPORT macro do something
--- trunk/koffice/kpresenter/part/tools/animationtool/CMakeLists.txt #982823:982824
@@ -18,7 +18,7 @@
 
 target_link_libraries(
     kpresentertoolanimation
-    koguiutils
+    
     flake
     kpresenterprivate
     kopageapp
--- trunk/koffice/kpresenter/plugins/eventactions/CMakeLists.txt #982823:982824
@@ -1,4 +1,4 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOGUIUTILS_INCLUDES} ${CMAKE_SOURCE_DIR}/kpresenter/part )
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  ${CMAKE_SOURCE_DIR}/kpresenter/part )
 
 set(kpresentereventactions_PART_SRCS
     sound/KPrSoundEventAction.cpp
--- trunk/koffice/kpresenter/plugins/pageeffects/barwipe/CMakeLists.txt #982823:982824
@@ -1,4 +1,4 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOGUIUTILS_INCLUDES} ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
 
 set(kpr_pageeffect_barwipe_PART_SRCS Plugin.cpp
     KPrBarWipeEffectFactory.cpp
@@ -14,7 +14,7 @@
     kpr_pageeffect_barwipe
     kpresenterprivate
     flake 
-    koguiutils
+    
     ${KDE4_KDECORE_LIBS}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
--- trunk/koffice/kpresenter/plugins/pageeffects/clockwipe/CMakeLists.txt #982823:982824
@@ -1,4 +1,4 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOGUIUTILS_INCLUDES} ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
 
 set(kpr_pageeffect_clockwipe_SRCS
     Plugin.cpp
@@ -28,7 +28,7 @@
     kpr_pageeffect_clockwipe 
     kpresenterprivate 
     flake
-    koguiutils
+    
     ${KDE4_KDECORE_LIBS}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
--- trunk/koffice/kpresenter/plugins/pageeffects/edgewipe/CMakeLists.txt #982823:982824
@@ -1,4 +1,4 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOGUIUTILS_INCLUDES} ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
 
 set(kpr_pageeffect_edgewipe_SRCS
     Plugin.cpp
@@ -39,7 +39,7 @@
     kpr_pageeffect_edgewipe
     kpresenterprivate
     flake
-    koguiutils
+    
     ${KDE4_KDECORE_LIBS}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}    
--- trunk/koffice/kpresenter/plugins/pageeffects/example/CMakeLists.txt #982823:982824
@@ -1,10 +1,10 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOGUIUTILS_INCLUDES} )
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  )
 
 set(kpr_pageeffect_example_PART_SRCS Plugin.cpp )
 
 kde4_add_plugin(kpr_pageeffect_example ${kpr_pageeffect_example_PART_SRCS})
 
-target_link_libraries(kpr_pageeffect_example kpresenterprivate flake koguiutils)
+target_link_libraries(kpr_pageeffect_example kpresenterprivate flake )
 
 install(TARGETS kpr_pageeffect_example  DESTINATION ${PLUGIN_INSTALL_DIR})
 
--- trunk/koffice/kpresenter/plugins/pageeffects/iriswipe/CMakeLists.txt #982823:982824
@@ -1,4 +1,4 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOGUIUTILS_INCLUDES} ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
 
 set(kpr_pageeffect_iriswipe_SRCS
     Plugin.cpp
@@ -22,7 +22,7 @@
     kpr_pageeffect_iriswipe
     kpresenterprivate
     flake
-    koguiutils
+    
     ${KDE4_KDECORE_LIBS}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}    
--- trunk/koffice/kpresenter/plugins/pageeffects/matrixwipe/CMakeLists.txt #982823:982824
@@ -1,4 +1,4 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOGUIUTILS_INCLUDES} ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
 
 set(kpr_pageeffect_matrixwipe_SRCS
     Plugin.cpp
@@ -39,7 +39,7 @@
     kpr_pageeffect_matrixwipe
     kpresenterprivate 
     flake 
-    koguiutils
+    
     ${KDE4_KDECORE_LIBS}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}
--- trunk/koffice/kpresenter/plugins/pageeffects/slidewipe/CMakeLists.txt #982823:982824
@@ -1,4 +1,4 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOGUIUTILS_INCLUDES} ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  ${CMAKE_SOURCE_DIR}/kpresenter/part ${CMAKE_SOURCE_DIR}/kpresenter/part/pageeffects )
 
 set(kpr_pageeffect_slidewipe_PART_SRCS Plugin.cpp
 KPrSlideWipeEffectFactory.cpp
@@ -19,7 +19,7 @@
     kpr_pageeffect_slidewipe
     kpresenterprivate
     flake
-    koguiutils
+    
     ${KDE4_KDECORE_LIBS}
     ${QT_QTCORE_LIBRARY}
     ${QT_QTGUI_LIBRARY}    
--- trunk/koffice/kpresenter/plugins/shapeanimations/example/CMakeLists.txt #982823:982824
@@ -1,4 +1,4 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} ${KOGUIUTILS_INCLUDES} )
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES}  )
 
 set(kpr_shapeanimation_example_PART_SRCS Plugin.cpp )