diff options
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 11 | ||||
| -rw-r--r-- | config.h.cmake | 4 | ||||
| -rw-r--r-- | doc/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kamera/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kcoloredit/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kdvi/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kgamma/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kghostview/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kiconedit/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kolourpaint/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kooka/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kpdf/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kpovmodeler/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kruler/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/ksnapshot/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kuickshow/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | doc/kview/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | kdvi/CMakeLists.txt | 80 | ||||
| -rw-r--r-- | kdvi/dviRenderer_draw.cpp | 1 | ||||
| -rw-r--r-- | kdvi/dviRenderer_export.cpp | 1 | ||||
| -rw-r--r-- | kdvi/pix/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | kdvi/util.cpp | 2 | ||||
| -rw-r--r-- | kpdf/xpdf/ConfigureChecks.cmake | 8 | ||||
| -rw-r--r-- | ksvg/ConfigureChecks.cmake | 6 |
25 files changed, 296 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4928d498..6938db02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,9 +48,12 @@ option( WITH_LIBPAPER "Enable libpaper support" OFF ) ##### user requested modules #################### + option( BUILD_ALL "Build all" OFF ) +option( BUILD_DOC "Build documentation" ${BUILD_ALL} ) option( BUILD_KAMERA "Build kamera" ${BUILD_ALL} ) option( BUILD_KCOLOREDIT "Build kcoloredit" ${BUILD_ALL} ) +option( BUILD_KDVI "Build kdvi" ${BUILD_ALL} ) option( BUILD_KVIEW "Build kview" ${BUILD_ALL} ) option( BUILD_KRULER "Build kruler" ${BUILD_ALL} ) option( BUILD_KPDF "Build kpdf" ${BUILD_ALL} ) @@ -76,8 +79,10 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ##### kdegraphics directories ################### +tde_conditional_add_subdirectory( BUILD_DOC doc ) tde_conditional_add_subdirectory( BUILD_KAMERA kamera ) tde_conditional_add_subdirectory( BUILD_KCOLOREDIT kcoloredit ) +tde_conditional_add_subdirectory( BUILD_KDVI kdvi ) tde_conditional_add_subdirectory( BUILD_KVIEW kview ) tde_conditional_add_subdirectory( BUILD_KRULER kruler ) tde_conditional_add_subdirectory( BUILD_KPDF kpdf ) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index f7dc5225..4899501e 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -9,6 +9,17 @@ # ################################################# +# freetype2 +if( BUILD_KDVI OR BUILD_KPDF OR BUILD_KSVG ) + pkg_search_module( FREETYPE freetype2 ) + if( FREETYPE_FOUND ) + set( HAVE_FREETYPE 1 ) + else( ) + tde_message_fatal( "freetype2 is required, but was not found on your system" ) + endif( ) +endif( ) + + # required stuff find_package( TQt ) find_package( TDE ) diff --git a/config.h.cmake b/config.h.cmake index d8a1feb9..28bbf5a2 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -1,7 +1,9 @@ #cmakedefine VERSION "@VERSION@" -// kpdf +// kpdf, kdvi #cmakedefine HAVE_FREETYPE 1 + +// kpdf #cmakedefine HAVE_DIRENT_H 1 #cmakedefine HAVE_SYS_NDIR_H 1 #cmakedefine HAVE_SYS_DIR_H 1 diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 00000000..df842e47 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_auto_add_subdirectories( ) diff --git a/doc/kamera/CMakeLists.txt b/doc/kamera/CMakeLists.txt new file mode 100644 index 00000000..ce0fd024 --- /dev/null +++ b/doc/kamera/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kamera ) diff --git a/doc/kcoloredit/CMakeLists.txt b/doc/kcoloredit/CMakeLists.txt new file mode 100644 index 00000000..07167786 --- /dev/null +++ b/doc/kcoloredit/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kcoloredit ) diff --git a/doc/kdvi/CMakeLists.txt b/doc/kdvi/CMakeLists.txt new file mode 100644 index 00000000..f698f057 --- /dev/null +++ b/doc/kdvi/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kdvi ) diff --git a/doc/kgamma/CMakeLists.txt b/doc/kgamma/CMakeLists.txt new file mode 100644 index 00000000..a1d97f9d --- /dev/null +++ b/doc/kgamma/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kgamma ) diff --git a/doc/kghostview/CMakeLists.txt b/doc/kghostview/CMakeLists.txt new file mode 100644 index 00000000..e18626c4 --- /dev/null +++ b/doc/kghostview/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kghostview ) diff --git a/doc/kiconedit/CMakeLists.txt b/doc/kiconedit/CMakeLists.txt new file mode 100644 index 00000000..3322b562 --- /dev/null +++ b/doc/kiconedit/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kiconedit ) diff --git a/doc/kolourpaint/CMakeLists.txt b/doc/kolourpaint/CMakeLists.txt new file mode 100644 index 00000000..d6ee87fd --- /dev/null +++ b/doc/kolourpaint/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kolourpaint ) diff --git a/doc/kooka/CMakeLists.txt b/doc/kooka/CMakeLists.txt new file mode 100644 index 00000000..a29388c5 --- /dev/null +++ b/doc/kooka/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kooka ) diff --git a/doc/kpdf/CMakeLists.txt b/doc/kpdf/CMakeLists.txt new file mode 100644 index 00000000..94d3179b --- /dev/null +++ b/doc/kpdf/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kpdf ) diff --git a/doc/kpovmodeler/CMakeLists.txt b/doc/kpovmodeler/CMakeLists.txt new file mode 100644 index 00000000..df8230fe --- /dev/null +++ b/doc/kpovmodeler/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kpovmodeler ) diff --git a/doc/kruler/CMakeLists.txt b/doc/kruler/CMakeLists.txt new file mode 100644 index 00000000..460788ac --- /dev/null +++ b/doc/kruler/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kruler ) diff --git a/doc/ksnapshot/CMakeLists.txt b/doc/ksnapshot/CMakeLists.txt new file mode 100644 index 00000000..6ee33ffd --- /dev/null +++ b/doc/ksnapshot/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION ksnapshot ) diff --git a/doc/kuickshow/CMakeLists.txt b/doc/kuickshow/CMakeLists.txt new file mode 100644 index 00000000..ec8123d4 --- /dev/null +++ b/doc/kuickshow/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kuickshow ) diff --git a/doc/kview/CMakeLists.txt b/doc/kview/CMakeLists.txt new file mode 100644 index 00000000..914d7dbc --- /dev/null +++ b/doc/kview/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_create_handbook( DESTINATION kview ) diff --git a/kdvi/CMakeLists.txt b/kdvi/CMakeLists.txt new file mode 100644 index 00000000..c9d48c3c --- /dev/null +++ b/kdvi/CMakeLists.txt @@ -0,0 +1,80 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# mutantturkey@gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_import( kviewshell ) + +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/kviewshell + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${FREETYPE_INCLUDE_DIRS} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +#### other data ################################# + +install( FILES + kdvi.desktop + DESTINATION ${XDG_APPS_INSTALL_DIR} ) + +install( FILES + kdvimultipage.desktop + DESTINATION ${SERVICES_INSTALL_DIR} ) + +install( FILES + kdvi.kcfg + DESTINATION ${KCFG_INSTALL_DIR} ) + +install( FILES + tips kdvi_part.rc + ${CMAKE_SOURCE_DIR}/kviewshell/kviewshell.rc + DESTINATION ${DATA_INSTALL_DIR}/kdvi ) + + +#### squeeze psheader.txt ####################### + +tde_add_executable( squeeze + SOURCES squeeze.c +) + +add_custom_command( + OUTPUT psheader.c + COMMAND squeeze ${CMAKE_CURRENT_SOURCE_DIR}/psheader.txt psheader.c + DEPENDS psheader.txt squeeze +) + + +#### kdvipart (module) ########################## + +tde_add_kpart( kdvipart AUTOMOC + SOURCES + renderedDviPagePixmap.cpp dviPageCache.cpp + kdvi_multipage.cpp kdvi_multipage_texthandling.cpp dviRenderer.cpp + bigEndianByteReader.cpp infodialog.cpp psheader.c + dviRenderer_draw.cpp dviRenderer_prescan.cpp + dviRenderer_export.cpp dviFile.cpp fontpool.cpp fontprogress.cpp + psgs.cpp fontMap.cpp fontEncoding.cpp fontEncodingPool.cpp + special.cpp util.cpp vf.cpp glyph.cpp optionDialogFontsWidget.cpp + optionDialogFontsWidget_base.ui optionDialogSpecialWidget.cpp + optionDialogSpecialWidget_base.ui TeXFont.cpp TeXFont_PK.cpp + TeXFont_PFB.cpp TeXFont_TFM.cpp TeXFontDefinition.cpp + dviWidget.cpp dvisourcesplitter.cpp prefs.kcfgc + LINK + kmultipage-shared kdeprint-shared kparts-shared ${FREETYPE_LIBRARIES} + DESTINATION ${PLUGIN_INSTALL_DIR} +) diff --git a/kdvi/dviRenderer_draw.cpp b/kdvi/dviRenderer_draw.cpp index b65f240e..6983c372 100644 --- a/kdvi/dviRenderer_draw.cpp +++ b/kdvi/dviRenderer_draw.cpp @@ -66,6 +66,7 @@ #include "textBox.h" #include "xdvi.h" +#include <stdlib.h> #include <kdebug.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kdvi/dviRenderer_export.cpp b/kdvi/dviRenderer_export.cpp index 5fbdbf35..7b875b45 100644 --- a/kdvi/dviRenderer_export.cpp +++ b/kdvi/dviRenderer_export.cpp @@ -26,6 +26,7 @@ #include <config.h> +#include <stdlib.h> #include <kapplication.h> #include <kmessagebox.h> #include <kdebug.h> diff --git a/kdvi/pix/CMakeLists.txt b/kdvi/pix/CMakeLists.txt new file mode 100644 index 00000000..7294b210 --- /dev/null +++ b/kdvi/pix/CMakeLists.txt @@ -0,0 +1,12 @@ +################################################# +# +# (C) 2010-2011 Calvin Morrison +# mutantturkey@gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +tde_install_icons( kdvi ) diff --git a/kdvi/util.cpp b/kdvi/util.cpp index 5b242cf1..205b60c2 100644 --- a/kdvi/util.cpp +++ b/kdvi/util.cpp @@ -51,6 +51,8 @@ #include <config.h> +#include <stdlib.h> + #include <kdebug.h> #include <kmessagebox.h> #include <klocale.h> diff --git a/kpdf/xpdf/ConfigureChecks.cmake b/kpdf/xpdf/ConfigureChecks.cmake index b1c33977..6c4b5614 100644 --- a/kpdf/xpdf/ConfigureChecks.cmake +++ b/kpdf/xpdf/ConfigureChecks.cmake @@ -9,14 +9,6 @@ # ################################################# -pkg_search_module( FREETYPE freetype2 ) -if( FREETYPE_FOUND ) - set( HAVE_FREETYPE 1 CACHE INTERNAL "" FORCE ) -else( ) - tde_message_fatal( "freetype2 is required, but was not found on your system" ) -endif( ) - - pkg_search_module( XFT xft ) if( NOT XFT_FOUND ) tde_message_fatal( "Xft is required, but was not found on your system" ) diff --git a/ksvg/ConfigureChecks.cmake b/ksvg/ConfigureChecks.cmake index e6942e69..9ff7d8ca 100644 --- a/ksvg/ConfigureChecks.cmake +++ b/ksvg/ConfigureChecks.cmake @@ -31,11 +31,7 @@ if( NOT ART_FOUND ) endif( ) -# freetype2 -pkg_search_module( FREETYPE freetype2 ) -if( NOT FREETYPE_FOUND ) - tde_message_fatal( "freetype2 is required, but was not found on your system" ) -endif( ) +# freetype2 2.2.x if( NOT ${FREETYPE_VERSION} VERSION_LESS "2.2" ) set( HAVE_FREETYPE_2_2_x 1 CACHE INTERNAL "" FORCE ) endif( ) |