Fix kdegraphics CMake compilation

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1244149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

27 files changed, 269 insertions, 14 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c666d8ca..18bb538d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,7 @@ option( BUILD_KGAMMA "Build kgamma" ${BUILD_ALL} )
 option( BUILD_KGHOSTVIEW "Build kghostview" ${BUILD_ALL} )
 option( BUILD_KICONEDIT "Build kiconedit" ${BUILD_ALL} )
 option( BUILD_KMRML "Build kmrml" ${BUILD_ALL} )
-option( BUILD_KOLOURPAINT "Build kolourpaint" )
+option( BUILD_KOLOURPAINT "Build kolourpaint" ${BUILD_ALL} )
 option( BUILD_KOOKA "Build kooka" ${BUILD_ALL} )
 option( BUILD_KPDF "Build kpdf" ${BUILD_ALL} )
 option( BUILD_KPOVMODELER "Build kpovmodeler" ${BUILD_ALL} )
diff --git a/kdvi/CMakeLists.txt b/kdvi/CMakeLists.txt
index 5ee14c52..82cbe170 100644
--- a/kdvi/CMakeLists.txt
+++ b/kdvi/CMakeLists.txt
@@ -87,3 +87,5 @@ tde_add_executable( kdvi AUTOMOC
   LINK kviewshell-static kparts-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
+
+add_subdirectory( pix )
\ No newline at end of file
diff --git a/kfax/CMakeLists.txt b/kfax/CMakeLists.txt
index ef71229f..e42b4f23 100644
--- a/kfax/CMakeLists.txt
+++ b/kfax/CMakeLists.txt
@@ -37,3 +37,7 @@ tde_add_executable( kfax AUTOMOC
   LINK kdeui-shared kdeprint-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
+
+#### icons ########################
+
+tde_install_icons( kfax )
\ No newline at end of file
diff --git a/kfaxview/CMakeLists.txt b/kfaxview/CMakeLists.txt
index 1188aa63..55d83905 100644
--- a/kfaxview/CMakeLists.txt
+++ b/kfaxview/CMakeLists.txt
@@ -31,7 +31,7 @@ link_directories(
 
 tde_install_icons( kfaxview )
 install( FILES kfaxview.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
-install( FILES ${CMAKE_SOURCE_DIR}/kviewshell/kviewshell.rc DESTINATION ${DATA_INSTALL_DIR}/kviewshell )
+install( FILES ${CMAKE_SOURCE_DIR}/kviewshell/kviewshell.rc DESTINATION ${DATA_INSTALL_DIR}/kfaxview/kviewshell.rc )
 install( FILES kfaxmultipage.desktop kfaxmultipage_tiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 
diff --git a/kfaxview/libkfaximage/CMakeLists.txt b/kfaxview/libkfaximage/CMakeLists.txt
index aebad1a6..d3813b67 100644
--- a/kfaxview/libkfaximage/CMakeLists.txt
+++ b/kfaxview/libkfaximage/CMakeLists.txt
@@ -23,6 +23,15 @@ link_directories(
 
 #### kfaximage (library) ########################
 
-tde_add_library( kfaximage STATIC_PIC AUTOMOC
+tde_add_library( kfaximage AUTOMOC
   SOURCES kfaximage.cpp faxexpand.cpp faxinit.cpp
 )
+
+#### kfaximage (shared library) ########################
+
+tde_add_library( kfaximage SHARED AUTOMOC
+  SOURCES kfaximage.cpp faxexpand.cpp faxinit.cpp
+  VERSION 1.0.0
+  LINK kparts-shared ${TQT_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}
+)
\ No newline at end of file
diff --git a/kfile-plugins/CMakeLists.txt b/kfile-plugins/CMakeLists.txt
index c35c329e..238bc4b2 100644
--- a/kfile-plugins/CMakeLists.txt
+++ b/kfile-plugins/CMakeLists.txt
@@ -9,6 +9,7 @@
 #
 #################################################
 
+add_subdirectory( dependencies )
 add_subdirectory( dvi )
 add_subdirectory( png )
 add_subdirectory( ps )
diff --git a/kfile-plugins/pdf/ConfigureChecks.cmake b/kfile-plugins/dependencies/CMakeLists.txt
index 28a617f1..e00ca923 100644
--- a/kfile-plugins/pdf/ConfigureChecks.cmake
+++ b/kfile-plugins/dependencies/CMakeLists.txt
@@ -9,8 +9,4 @@
 #
 #################################################
 
-# poppler-qt
-pkg_search_module( POPPLER_QT poppler-qt )
-if( NOT POPPLER_QT_FOUND )
-  tde_message_fatal( "poppler-qt is required, but was not found on your system" )
-endif( )
+add_subdirectory( poppler-tqt )
\ No newline at end of file
diff --git a/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
new file mode 100644
index 00000000..39984c71
--- /dev/null
+++ b/kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
@@ -0,0 +1,44 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+project( libpoppler-tqt )
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${TDE_INCLUDE_DIR}
+  ${TQT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
+  /usr/include/poppler
+)
+
+link_directories(
+  ${TQT_LIBRARY_DIRS}
+)
+
+##### headers ###################################
+
+install( FILES
+    poppler-qt.h poppler-page-transition.h poppler-link-qt3.h
+  DESTINATION ${INCLUDE_INSTALL_DIR}/kde )
+
+##### poppler-tqt (shared) ############################
+
+tde_add_library( poppler-tqt SHARED AUTOMOC
+  SOURCES
+    poppler-document.cc poppler-fontinfo.cc
+    poppler-link.cc poppler-page.cc
+    poppler-page-transition.cc poppler-page-transition-private.h
+    poppler-private.cc poppler-private.h
+  VERSION 0.0.0
+  LINK poppler ${TQT_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}
+)
\ No newline at end of file
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
index 40e45469..93d5a49c 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
@@ -316,7 +316,11 @@ bool Document::print(const TQString &fileName, TQValueList<int> pageList, double
 
 bool Document::print(const TQString &file, TQValueList<int> pageList, double hDPI, double vDPI, int rotate, int paperWidth, int paperHeight)
 {
+#ifdef POPPLER_016
+  PSOutputDev *psOut = new PSOutputDev(file.latin1(), &(data->doc), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight);
+#else
   PSOutputDev *psOut = new PSOutputDev(file.latin1(), data->doc.getXRef(), data->doc.getCatalog(), NULL, 1, data->doc.getNumPages(), psModePS, paperWidth, paperHeight);
+#endif
   
   if (psOut->isOk()) {
     TQValueList<int>::iterator it;
diff --git a/kfile-plugins/dependencies/poppler-tqt/poppler-qt.h b/kfile-plugins/dependencies/poppler-tqt/poppler-qt.h
index 9150ee3b..db2a402e 100644
--- a/kfile-plugins/dependencies/poppler-tqt/poppler-qt.h
+++ b/kfile-plugins/dependencies/poppler-tqt/poppler-qt.h
@@ -23,6 +23,8 @@
 #ifndef __POPPLER_TQT_H__
 #define __POPPLER_TQT_H__
 
+#define POPPLER_016
+
 #include "poppler-link-qt3.h"
 #include "poppler-page-transition.h"
 
diff --git a/kfile-plugins/pdf/CMakeLists.txt b/kfile-plugins/pdf/CMakeLists.txt
index 748b70ed..c75dcf3f 100644
--- a/kfile-plugins/pdf/CMakeLists.txt
+++ b/kfile-plugins/pdf/CMakeLists.txt
@@ -9,14 +9,12 @@
 #
 #################################################
 
-include( ConfigureChecks.cmake )
-
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_BINARY_DIR}
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
-  ${POPPLER_QT_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/kfile-plugins/dependencies/poppler-tqt
 )
 
 link_directories(
@@ -33,6 +31,6 @@ install( FILES kfile_pdf.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
 
 tde_add_kpart( kfile_pdf AUTOMOC
   SOURCES kfile_pdf.cpp
-  LINK kio-shared ${POPPLER_QT_LIBRARIES}
+  LINK kio-shared -L${CMAKE_BINARY_DIR}/kfile-plugins/dependencies/poppler-tqt -lpoppler-tqt
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kghostview/CMakeLists.txt b/kghostview/CMakeLists.txt
index f984f119..e8f8d2a1 100644
--- a/kghostview/CMakeLists.txt
+++ b/kghostview/CMakeLists.txt
@@ -47,13 +47,14 @@ tde_add_library( kghostviewlib SHARED AUTOMOC
     kgvfactory.cpp  generalsettingswidget.ui gssettingswidget.ui
     thumbnailservice.cpp  configuration.kcfgc
   LINK dscparse-static kdeprint-shared kparts-shared
+  VERSION 0.0.0
   DESTINATION ${LIB_INSTALL_DIR}
 )
 
 
 #### kghostviewpart (module) ####################
 
-tde_add_kpart( kghostviewpart AUTOMOC
+tde_add_kpart( libkghostviewpart AUTOMOC
   SOURCES part_init.cpp
   LINK kghostviewlib-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
index 1d8c9df2..a838d041 100644
--- a/kpovmodeler/CMakeLists.txt
+++ b/kpovmodeler/CMakeLists.txt
@@ -12,6 +12,7 @@
 include( ConfigureChecks.cmake )
 
 add_subdirectory( pics )
+add_subdirectory( examples )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
@@ -19,6 +20,7 @@ include_directories(
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
   ${GLU_INCLUDE_DIRS}
+  /usr/include/freetype2
 )
 
 link_directories(
diff --git a/kpovmodeler/examples/CMakeLists.txt b/kpovmodeler/examples/CMakeLists.txt
new file mode 100644
index 00000000..59309e03
--- /dev/null
+++ b/kpovmodeler/examples/CMakeLists.txt
@@ -0,0 +1,13 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_subdirectory( scenes )
+add_subdirectory( includes )
diff --git a/kpovmodeler/examples/includes/CMakeLists.txt b/kpovmodeler/examples/includes/CMakeLists.txt
new file mode 100644
index 00000000..5b70b5bc
--- /dev/null
+++ b/kpovmodeler/examples/includes/CMakeLists.txt
@@ -0,0 +1,13 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_subdirectory( inlined )
+add_subdirectory( original )
diff --git a/kpovmodeler/examples/includes/inlined/CMakeLists.txt b/kpovmodeler/examples/includes/inlined/CMakeLists.txt
new file mode 100644
index 00000000..2622cf64
--- /dev/null
+++ b/kpovmodeler/examples/includes/inlined/CMakeLists.txt
@@ -0,0 +1,18 @@
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+##### other data ################################
+
+install( FILES
+    chars.kpm finish.kpm glass.kpm golds.kpm metals.kpm shapes.kpm
+    shapes2.kpm shapesq.kpm skies.kpm stars.kpm stones1.kpm stones2.kpm
+    textures.kpm woods.kpm
+  DESTINATION ${DATA_INSTALL_DIR}/kpovmodeler/examples/includes/inlined )
diff --git a/kpovmodeler/examples/includes/original/CMakeLists.txt b/kpovmodeler/examples/includes/original/CMakeLists.txt
new file mode 100644
index 00000000..c5994660
--- /dev/null
+++ b/kpovmodeler/examples/includes/original/CMakeLists.txt
@@ -0,0 +1,18 @@
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+##### other data ################################
+
+install( FILES
+    chars.kpm finish.kpm glass.kpm golds.kpm metals.kpm shapes.kpm
+    shapes2.kpm shapesq.kpm skies.kpm stars.kpm stones1.kpm stones2.kpm
+    textures.kpm woods.kpm
+  DESTINATION ${DATA_INSTALL_DIR}/kpovmodeler/examples/includes/original )
diff --git a/kpovmodeler/examples/scenes/CMakeLists.txt b/kpovmodeler/examples/scenes/CMakeLists.txt
new file mode 100644
index 00000000..57e4111c
--- /dev/null
+++ b/kpovmodeler/examples/scenes/CMakeLists.txt
@@ -0,0 +1,16 @@
+#################################################
+#
+#  (C) 2010-2011 Calvin Morrison
+#  mutantturkey@gmail.com
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+add_subdirectory( advanced )
+add_subdirectory( csg )
+add_subdirectory( interior )
+add_subdirectory( lights )
+add_subdirectory( objects )
\ No newline at end of file
diff --git a/kpovmodeler/examples/scenes/advanced/CMakeLists.txt b/kpovmodeler/examples/scenes/advanced/CMakeLists.txt
new file mode 100644
index 00000000..2ffef64f
--- /dev/null
+++ b/kpovmodeler/examples/scenes/advanced/CMakeLists.txt
@@ -0,0 +1,16 @@
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+##### other data ################################
+
+install( FILES
+    ants.kpm bee.kpm ink.kpm table.kpm
+  DESTINATION ${DATA_INSTALL_DIR}/kpovmodeler/examples/scenes/advanced )
diff --git a/kpovmodeler/examples/scenes/csg/CMakeLists.txt b/kpovmodeler/examples/scenes/csg/CMakeLists.txt
new file mode 100644
index 00000000..893c6525
--- /dev/null
+++ b/kpovmodeler/examples/scenes/csg/CMakeLists.txt
@@ -0,0 +1,16 @@
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+##### other data ################################
+
+install( FILES
+    cheese.kpm emptybox.kpm heightfield.kpm
+  DESTINATION ${DATA_INSTALL_DIR}/kpovmodeler/examples/scenes/csg )
diff --git a/kpovmodeler/examples/scenes/interior/CMakeLists.txt b/kpovmodeler/examples/scenes/interior/CMakeLists.txt
new file mode 100644
index 00000000..3985d4ec
--- /dev/null
+++ b/kpovmodeler/examples/scenes/interior/CMakeLists.txt
@@ -0,0 +1,16 @@
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+##### other data ################################
+
+install( FILES
+    cubes.kpm media1.kpm media2.kpm media3.kpm spheres.kpm
+  DESTINATION ${DATA_INSTALL_DIR}/kpovmodeler/examples/scenes/interior )
diff --git a/kpovmodeler/examples/scenes/lights/CMakeLists.txt b/kpovmodeler/examples/scenes/lights/CMakeLists.txt
new file mode 100644
index 00000000..6dd8d346
--- /dev/null
+++ b/kpovmodeler/examples/scenes/lights/CMakeLists.txt
@@ -0,0 +1,16 @@
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+##### other data ################################
+
+install( FILES
+    arealight.kpm arealight2.kpm spotlight.kpm
+  DESTINATION ${DATA_INSTALL_DIR}/kpovmodeler/examples/scenes/lights )
diff --git a/kpovmodeler/examples/scenes/objects/CMakeLists.txt b/kpovmodeler/examples/scenes/objects/CMakeLists.txt
new file mode 100644
index 00000000..0d8d78db
--- /dev/null
+++ b/kpovmodeler/examples/scenes/objects/CMakeLists.txt
@@ -0,0 +1,17 @@
+#################################################
+#
+#  (C) 2011 Timothy Pearson
+#  kb9vqf (AT) pearsoncomputing.net
+#
+#  Improvements and feedback are welcome
+#
+#  This file is released under GPL >= 2
+#
+#################################################
+
+##### other data ################################
+
+install( FILES
+    allobjects.kpm fractals.kpm lathe.kpm prism.kpm sor.kpm
+    superellipsoid.kpm text.kpm
+  DESTINATION ${DATA_INSTALL_DIR}/kpovmodeler/examples/scenes/objects )
diff --git a/ksvg/ConfigureChecks.cmake b/ksvg/ConfigureChecks.cmake
index 9ff7d8ca..76177f57 100644
--- a/ksvg/ConfigureChecks.cmake
+++ b/ksvg/ConfigureChecks.cmake
@@ -45,3 +45,13 @@ if( FRIBIDI_FOUND )
 else( )
   tde_message_fatal( "fribidi is required, but was not found on your system" )
 endif( )
+
+
+##### check for fontconfig ######################
+
+pkg_search_module( FONTCONFIG fontconfig )
+if( NOT FONTCONFIG_FOUND )
+    message(FATAL_ERROR "\nfontconfig are required, but not found on your system" )
+endif( NOT FONTCONFIG_FOUND )
+set( HAVE_FONTCONFIG 1 CACHE INTERNAL "" FORCE )
+
diff --git a/ksvg/core/CMakeLists.txt b/ksvg/core/CMakeLists.txt
index 13def4fd..4f3136d2 100644
--- a/ksvg/core/CMakeLists.txt
+++ b/ksvg/core/CMakeLists.txt
@@ -37,7 +37,7 @@ install( FILES
 
 install( FILES
     ksvgrenderer.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR} )
+  DESTINATION ${SERVICETYPES_INSTALL_DIR} )
 
 
 ##### ksvgcore (static) #########################
diff --git a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
index 7e1cee2c..098f836d 100644
--- a/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
+++ b/ksvg/impl/libs/libtext2path/src/CMakeLists.txt
@@ -17,6 +17,7 @@ include_directories(
   ${TQT_INCLUDE_DIRS}
   ${FREETYPE_INCLUDE_DIRS}
   ${FRIBIDI_INCLUDE_DIRS}
+  ${FONTCONFIG_INCLUDE_DIRS}
 )
 
 
@@ -35,3 +36,14 @@ tde_add_library( text2path STATIC_PIC
     Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp
     GlyphTracer.cpp Converter.cpp QtUnicode.cpp
 )
+
+##### text2path (shared) ########################
+
+tde_add_library( text2path SHARED
+  SOURCES
+    Affine.cpp Rectangle.cpp Font.cpp Glyph.cpp
+    GlyphTracer.cpp Converter.cpp QtUnicode.cpp
+  VERSION 0.0.0
+  LINK ${FREETYPE_LIBRARIES} ${FRIBIDI_LIBRARIES} ${FONTCONFIG_LIBRARIES}
+  DESTINATION ${LIB_INSTALL_DIR}
+)
\ No newline at end of file
diff --git a/kviewshell/CMakeLists.txt b/kviewshell/CMakeLists.txt
index 7361af84..dc28b4f8 100644
--- a/kviewshell/CMakeLists.txt
+++ b/kviewshell/CMakeLists.txt
@@ -77,6 +77,7 @@ tde_add_library( kmultipage SHARED AUTOMOC
     documentPageCache.cpp documentWidget.cpp searchWidget.cpp
     selection.cpp documentRenderer.cpp history.cpp kvsprefs.kcfgc
     tableOfContents.cpp kprintDialogPage_pageoptions.cpp
+  VERSION 0.0.0
   LINK kparts-shared kdeprint-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
@@ -95,6 +96,16 @@ tde_add_kpart( kviewerpart AUTOMOC
 )
 
 
+##### kviewshell (executable) ##################
+
+tde_add_executable( kviewshell AUTOMOC
+  SOURCES
+    main.cpp
+  LINK kviewshell-static kparts-shared
+  DESTINATION ${BIN_INSTALL_DIR}
+)
+
+
 ##### emptymultipagepart (module) ###############
 
 tde_add_kpart( emptymultipagepart AUTOMOC