Browse Source

Fix kdegraphics CMake compilation

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1244149 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
tags/v3.5.13
tpearson 9 years ago
parent
commit
83b9df8edf
27 changed files with 269 additions and 14 deletions
  1. +1
    -1
      CMakeLists.txt
  2. +2
    -0
      kdvi/CMakeLists.txt
  3. +4
    -0
      kfax/CMakeLists.txt
  4. +1
    -1
      kfaxview/CMakeLists.txt
  5. +10
    -1
      kfaxview/libkfaximage/CMakeLists.txt
  6. +1
    -0
      kfile-plugins/CMakeLists.txt
  7. +1
    -5
      kfile-plugins/dependencies/CMakeLists.txt
  8. +44
    -0
      kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt
  9. +4
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
  10. +2
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-qt.h
  11. +2
    -4
      kfile-plugins/pdf/CMakeLists.txt
  12. +2
    -1
      kghostview/CMakeLists.txt
  13. +2
    -0
      kpovmodeler/CMakeLists.txt
  14. +13
    -0
      kpovmodeler/examples/CMakeLists.txt
  15. +13
    -0
      kpovmodeler/examples/includes/CMakeLists.txt
  16. +18
    -0
      kpovmodeler/examples/includes/inlined/CMakeLists.txt
  17. +18
    -0
      kpovmodeler/examples/includes/original/CMakeLists.txt
  18. +16
    -0
      kpovmodeler/examples/scenes/CMakeLists.txt
  19. +16
    -0
      kpovmodeler/examples/scenes/advanced/CMakeLists.txt
  20. +16
    -0
      kpovmodeler/examples/scenes/csg/CMakeLists.txt
  21. +16
    -0
      kpovmodeler/examples/scenes/interior/CMakeLists.txt
  22. +16
    -0
      kpovmodeler/examples/scenes/lights/CMakeLists.txt
  23. +17
    -0
      kpovmodeler/examples/scenes/objects/CMakeLists.txt
  24. +10
    -0
      ksvg/ConfigureChecks.cmake
  25. +1
    -1
      ksvg/core/CMakeLists.txt
  26. +12
    -0
      ksvg/impl/libs/libtext2path/src/CMakeLists.txt
  27. +11
    -0
      kviewshell/CMakeLists.txt

+ 1
- 1
CMakeLists.txt View File

@@ -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} )


+ 2
- 0
kdvi/CMakeLists.txt View File

@@ -87,3 +87,5 @@ tde_add_executable( kdvi AUTOMOC
LINK kviewshell-static kparts-shared
DESTINATION ${BIN_INSTALL_DIR}
)

add_subdirectory( pix )

+ 4
- 0
kfax/CMakeLists.txt View File

@@ -37,3 +37,7 @@ tde_add_executable( kfax AUTOMOC
LINK kdeui-shared kdeprint-shared
DESTINATION ${BIN_INSTALL_DIR}
)

#### icons ########################

tde_install_icons( kfax )

+ 1
- 1
kfaxview/CMakeLists.txt View File

@@ -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} )




+ 10
- 1
kfaxview/libkfaximage/CMakeLists.txt View File

@@ -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}
)

+ 1
- 0
kfile-plugins/CMakeLists.txt View File

@@ -9,6 +9,7 @@
#
#################################################

add_subdirectory( dependencies )
add_subdirectory( dvi )
add_subdirectory( png )
add_subdirectory( ps )


kfile-plugins/pdf/ConfigureChecks.cmake → kfile-plugins/dependencies/CMakeLists.txt View File

@@ -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 )

+ 44
- 0
kfile-plugins/dependencies/poppler-tqt/CMakeLists.txt View File

@@ -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}
)

+ 4
- 0
kfile-plugins/dependencies/poppler-tqt/poppler-document.cc View File

@@ -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;


+ 2
- 0
kfile-plugins/dependencies/poppler-tqt/poppler-qt.h View File

@@ -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"



+ 2
- 4
kfile-plugins/pdf/CMakeLists.txt View File

@@ -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}
)

+ 2
- 1
kghostview/CMakeLists.txt View File

@@ -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}


+ 2
- 0
kpovmodeler/CMakeLists.txt View File

@@ -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(


+ 13
- 0
kpovmodeler/examples/CMakeLists.txt View File

@@ -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 )

+ 13
- 0
kpovmodeler/examples/includes/CMakeLists.txt View File

@@ -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 )

+ 18
- 0
kpovmodeler/examples/includes/inlined/CMakeLists.txt View File

@@ -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 )

+ 18
- 0
kpovmodeler/examples/includes/original/CMakeLists.txt View File

@@ -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 )

+ 16
- 0
kpovmodeler/examples/scenes/CMakeLists.txt View File

@@ -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 )

+ 16
- 0
kpovmodeler/examples/scenes/advanced/CMakeLists.txt View File

@@ -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 )

+ 16
- 0
kpovmodeler/examples/scenes/csg/CMakeLists.txt View File

@@ -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 )

+ 16
- 0
kpovmodeler/examples/scenes/interior/CMakeLists.txt View File

@@ -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 )

+ 16
- 0
kpovmodeler/examples/scenes/lights/CMakeLists.txt View File

@@ -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 )

+ 17
- 0
kpovmodeler/examples/scenes/objects/CMakeLists.txt View File

@@ -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 )

+ 10
- 0
ksvg/ConfigureChecks.cmake View File

@@ -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 )


+ 1
- 1
ksvg/core/CMakeLists.txt View File

@@ -37,7 +37,7 @@ install( FILES

install( FILES
ksvgrenderer.desktop
DESTINATION ${SERVICES_INSTALL_DIR} )
DESTINATION ${SERVICETYPES_INSTALL_DIR} )


##### ksvgcore (static) #########################


+ 12
- 0
ksvg/impl/libs/libtext2path/src/CMakeLists.txt View File

@@ -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}
)

+ 11
- 0
kviewshell/CMakeLists.txt View File

@@ -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


Loading…
Cancel
Save