[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/trinity/kdegraphics
From: Serghei Amelian <serghei.amelian () gmail ! com>
Date: 2011-05-07 18:42:34
Message-ID: 20110507184234.79671AC76E () svn ! kde ! org
[Download RAW message or body]
SVN commit 1230812 by samelian:
[kdegraphics] added cmake support for doc and kdvi
M +5 -0 CMakeLists.txt
M +11 -0 ConfigureChecks.cmake
M +3 -1 config.h.cmake
A doc/CMakeLists.txt
A doc/kamera/CMakeLists.txt
A doc/kcoloredit/CMakeLists.txt
A doc/kdvi/CMakeLists.txt
A doc/kgamma/CMakeLists.txt
A doc/kghostview/CMakeLists.txt
A doc/kiconedit/CMakeLists.txt
A doc/kolourpaint/CMakeLists.txt
A doc/kooka/CMakeLists.txt
A doc/kpdf/CMakeLists.txt
A doc/kpovmodeler/CMakeLists.txt
A doc/kruler/CMakeLists.txt
A doc/ksnapshot/CMakeLists.txt
A doc/kuickshow/CMakeLists.txt
A doc/kview/CMakeLists.txt
A kdvi/CMakeLists.txt
M +1 -0 kdvi/dviRenderer_draw.cpp
M +1 -0 kdvi/dviRenderer_export.cpp
A kdvi/pix/CMakeLists.txt
M +2 -0 kdvi/util.cpp
M +0 -8 kpdf/xpdf/ConfigureChecks.cmake
M +1 -5 ksvg/ConfigureChecks.cmake
--- branches/trinity/kdegraphics/CMakeLists.txt #1230811:1230812
@@ -48,9 +48,12 @@
##### 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 @@
##### 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 )
--- branches/trinity/kdegraphics/ConfigureChecks.cmake #1230811:1230812
@@ -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 )
--- branches/trinity/kdegraphics/config.h.cmake #1230811:1230812
@@ -1,7 +1,9 @@
#cmakedefine VERSION "@VERSION@"
+// kpdf, kdvi
+#cmakedefine HAVE_FREETYPE 1
+
// kpdf
-#cmakedefine HAVE_FREETYPE 1
#cmakedefine HAVE_DIRENT_H 1
#cmakedefine HAVE_SYS_NDIR_H 1
#cmakedefine HAVE_SYS_DIR_H 1
--- branches/trinity/kdegraphics/kdvi/dviRenderer_draw.cpp #1230811:1230812
@@ -66,6 +66,7 @@
#include "textBox.h"
#include "xdvi.h"
+#include <stdlib.h>
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
--- branches/trinity/kdegraphics/kdvi/dviRenderer_export.cpp #1230811:1230812
@@ -26,6 +26,7 @@
#include <config.h>
+#include <stdlib.h>
#include <kapplication.h>
#include <kmessagebox.h>
#include <kdebug.h>
--- branches/trinity/kdegraphics/kdvi/util.cpp #1230811:1230812
@@ -51,6 +51,8 @@
#include <config.h>
+#include <stdlib.h>
+
#include <kdebug.h>
#include <kmessagebox.h>
#include <klocale.h>
--- branches/trinity/kdegraphics/kpdf/xpdf/ConfigureChecks.cmake #1230811:1230812
@@ -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" )
--- branches/trinity/kdegraphics/ksvg/ConfigureChecks.cmake #1230811:1230812
@@ -31,11 +31,7 @@
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( )
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic