summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ConfigureChecks.cmake12
-rw-r--r--kpdf/CMakeLists.txt3
-rw-r--r--kpdf/xpdf/splash/CMakeLists.txt1
-rw-r--r--kpdf/xpdf/xpdf/CMakeLists.txt1
-rw-r--r--kpovmodeler/CMakeLists.txt2
-rw-r--r--ksvg/CMakeLists.txt1
-rw-r--r--ksvg/ConfigureChecks.cmake9
-rw-r--r--ksvg/impl/CMakeLists.txt1
8 files changed, 19 insertions, 11 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 3a6eae15..8df89a93 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -30,6 +30,7 @@ endif( )
# freetype2
+##### check for fontconfig ######################
if( BUILD_KDVI OR BUILD_KPDF OR BUILD_KSVG )
pkg_search_module( FREETYPE freetype2 )
if( FREETYPE_FOUND )
@@ -38,3 +39,14 @@ if( BUILD_KDVI OR BUILD_KPDF OR BUILD_KSVG )
tde_message_fatal( "freetype2 is required, but was not found on your system" )
endif( )
endif( )
+
+
+##### check for fontconfig ######################
+if( BUILD_KPDF OR BUILD_KSVG )
+ pkg_search_module( FONTCONFIG fontconfig )
+ if( FONTCONFIG_FOUND )
+ set( HAVE_FONTCONFIG 1 CACHE INTERNAL "" FORCE )
+ else( )
+ message(FATAL_ERROR "fontconfig is required, but not found on your system" )
+ endif( )
+endif( )
diff --git a/kpdf/CMakeLists.txt b/kpdf/CMakeLists.txt
index fedd6665..e6a46a93 100644
--- a/kpdf/CMakeLists.txt
+++ b/kpdf/CMakeLists.txt
@@ -51,7 +51,8 @@ tde_add_kpart( libkpdfpart AUTOMOC
LINK
kpdfconf-static kpdfui-static kpdfcore-static generatorkimgio-static
generatorpdf-static xpdf-static goo-static splash-static fofi-static
- tdeutils-shared tdeprint-shared tdeparts-shared ${PAPER_LIBRARY} ${XFT_LIBRARIES}
+ tdeutils-shared tdeprint-shared tdeparts-shared
+ ${PAPER_LIBRARY} ${XFT_LIBRARIES} ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES}
DEPENDENCIES kpdfconf-static
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kpdf/xpdf/splash/CMakeLists.txt b/kpdf/xpdf/splash/CMakeLists.txt
index a7573b6c..650debba 100644
--- a/kpdf/xpdf/splash/CMakeLists.txt
+++ b/kpdf/xpdf/splash/CMakeLists.txt
@@ -29,4 +29,5 @@ tde_add_library( splash STATIC_PIC
SplashPath.cc SplashPattern.cc SplashScreen.cc SplashState.cc
SplashT1Font.cc SplashT1FontEngine.cc SplashT1FontFile.cc
SplashXPath.cc SplashXPathScanner.cc
+ LINK ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES}
)
diff --git a/kpdf/xpdf/xpdf/CMakeLists.txt b/kpdf/xpdf/xpdf/CMakeLists.txt
index eb5e1762..db01bb97 100644
--- a/kpdf/xpdf/xpdf/CMakeLists.txt
+++ b/kpdf/xpdf/xpdf/CMakeLists.txt
@@ -33,4 +33,5 @@ tde_add_library( xpdf STATIC_PIC
Parser.cc PSOutputDev.cc SecurityHandler.cc SplashOutputDev.cc
Stream.cc JPXStream.cc TextOutputDev.cc UnicodeMap.cc
UnicodeTypeTable.cc XRef.cc
+ LINK ${FONTCONFIG_LIBRARIES}
)
diff --git a/kpovmodeler/CMakeLists.txt b/kpovmodeler/CMakeLists.txt
index f1f10b1f..6ec98ae4 100644
--- a/kpovmodeler/CMakeLists.txt
+++ b/kpovmodeler/CMakeLists.txt
@@ -112,7 +112,7 @@ tde_add_library( kpovmodeler SHARED AUTOMOC
pmlibraryiconview.cpp pmlibraryobjectsearch.cpp pmpluginmanager.cpp
pmpartiface.skel
VERSION 0.0.0
- LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES}
+ LINK tdeparts-shared ${GLU_LIBRARIES} ${XMU_LIBRARIES} ${FREETYPE_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/ksvg/CMakeLists.txt b/ksvg/CMakeLists.txt
index ba7ae70a..bf6fdb31 100644
--- a/ksvg/CMakeLists.txt
+++ b/ksvg/CMakeLists.txt
@@ -39,5 +39,6 @@ tde_add_library( ksvg SHARED
ksvgxrgbrender-static text2path-static ksvgart-static
LINK
tdehtml-shared ${LCMS_LIBRARY} ${ART_LIBRARIES} ${FRIBIDI_LIBRARIES}
+ ${FREETYPE_LIBRARIES} ${FONTCONFIG_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/ksvg/ConfigureChecks.cmake b/ksvg/ConfigureChecks.cmake
index e3c3893a..9c2622c8 100644
--- a/ksvg/ConfigureChecks.cmake
+++ b/ksvg/ConfigureChecks.cmake
@@ -53,12 +53,3 @@ 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/impl/CMakeLists.txt b/ksvg/impl/CMakeLists.txt
index 8b44c254..64599da1 100644
--- a/ksvg/impl/CMakeLists.txt
+++ b/ksvg/impl/CMakeLists.txt
@@ -89,4 +89,5 @@ tde_add_library( ksvgdomimpl STATIC_PIC AUTOMOC
SVGFontFaceUriElementImpl.cc SVGDefinitionSrcElementImpl.cc
SVGHKernElementImpl.cc SVGVKernElementImpl.cc SVGMetadataElementImpl.cc
SVGForeignObjectElementImpl.cc svgpathparser.cc
+ LINK kjs-shared
)